Wed Jun 24 13:32:10 2020 UTC ()
Move luajit out of SUPPORTED_OPTIONS where unsupported.


(nia)
diff -r1.1 -r1.2 pkgsrc/games/love010/options.mk
diff -r1.1 -r1.2 pkgsrc/games/solarus/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/games/love010/options.mk (expand / switch to unified diff)

--- pkgsrc/games/love010/options.mk 2020/06/24 11:24:45 1.1
+++ pkgsrc/games/love010/options.mk 2020/06/24 13:32:09 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: options.mk,v 1.1 2020/06/24 11:24:45 nia Exp $ 1# $NetBSD: options.mk,v 1.2 2020/06/24 13:32:09 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.love 3PKG_OPTIONS_VAR= PKG_OPTIONS.love
4PKG_SUPPORTED_OPTIONS= luajit 
5 4
6.include "../../lang/LuaJIT2/platform.mk" 5.include "../../lang/LuaJIT2/platform.mk"
7.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss]) 6.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
 7PKG_SUPPORTED_OPTIONS= luajit
8PKG_SUGGESTED_OPTIONS= luajit 8PKG_SUGGESTED_OPTIONS= luajit
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13.if !empty(PKG_OPTIONS:Mluajit) 13.if !empty(PKG_OPTIONS:Mluajit)
14# JIT needs WX mappings 14# JIT needs WX mappings
15NOT_PAX_MPROTECT_SAFE+= love0.10/bin/love 15NOT_PAX_MPROTECT_SAFE+= love0.10/bin/love
16. include "../../lang/LuaJIT2/buildlink3.mk" 16. include "../../lang/LuaJIT2/buildlink3.mk"
17.else 17.else
18CONFIGURE_ARGS+= --with-lua=lua 18CONFIGURE_ARGS+= --with-lua=lua
19CONFIGURE_ARGS+= --with-luaversion=-5.1 19CONFIGURE_ARGS+= --with-luaversion=-5.1
20. include "../../lang/lua51/buildlink3.mk" 20. include "../../lang/lua51/buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/games/solarus/options.mk (expand / switch to unified diff)

--- pkgsrc/games/solarus/options.mk 2020/06/24 13:28:26 1.1
+++ pkgsrc/games/solarus/options.mk 2020/06/24 13:32:09 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: options.mk,v 1.1 2020/06/24 13:28:26 nia Exp $ 1# $NetBSD: options.mk,v 1.2 2020/06/24 13:32:09 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.solarus 3PKG_OPTIONS_VAR= PKG_OPTIONS.solarus
4PKG_SUPPORTED_OPTIONS= luajit 
5 4
6.include "../../lang/LuaJIT2/platform.mk" 5.include "../../lang/LuaJIT2/platform.mk"
7.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss]) 6.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
 7PKG_SUPPORTED_OPTIONS= luajit
8PKG_SUGGESTED_OPTIONS= luajit 8PKG_SUGGESTED_OPTIONS= luajit
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13.if !empty(PKG_OPTIONS:Mluajit) 13.if !empty(PKG_OPTIONS:Mluajit)
14CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=ON 14CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=ON
15. include "../../lang/LuaJIT2/buildlink3.mk" 15. include "../../lang/LuaJIT2/buildlink3.mk"
16.else 16.else
17CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF 17CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF
18. include "../../lang/lua51/buildlink3.mk" 18. include "../../lang/lua51/buildlink3.mk"
19.endif 19.endif