Wed Jun 24 11:24:46 2020 UTC ()
love010: Allow building without luajit. Should help aarch64 builds.


(nia)
diff -r1.3 -r1.4 pkgsrc/games/love010/Makefile
diff -r0 -r1.1 pkgsrc/games/love010/options.mk

cvs diff -r1.3 -r1.4 pkgsrc/games/love010/Makefile (expand / switch to context diff)
--- pkgsrc/games/love010/Makefile 2020/06/05 12:49:05 1.3
+++ pkgsrc/games/love010/Makefile 2020/06/24 11:24:45 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/06/05 12:49:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/24 11:24:45 nia Exp $
 
 DISTNAME=	love-0.10.2-linux-src
 PKGNAME=	${DISTNAME:S/-linux-src//:S/love/love010/}
@@ -18,16 +18,12 @@
 USE_TOOLS+=	pkg-config
 USE_LIBTOOL=	yes
 
-LUA_VERSIONS_INCOMPATIBLE=	52
-
-# JIT needs WX mappings
-NOT_PAX_MPROTECT_SAFE+=		love0.10/bin/love
-
 GNU_CONFIGURE_PREFIX=		${PREFIX}/love0.10
 GNU_CONFIGURE_MANDIR=		${PREFIX}/love0.10/${PKGMANDIR}/
 BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/love0.10/lib
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/love0.10/lib
 
+.include "options.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
@@ -35,8 +31,6 @@
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../audio/libmodplug/buildlink3.mk"

File Added: pkgsrc/games/love010/options.mk
# $NetBSD: options.mk,v 1.1 2020/06/24 11:24:45 nia Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.love
PKG_SUPPORTED_OPTIONS=	luajit

.include "../../lang/LuaJIT2/platform.mk"
.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
PKG_SUGGESTED_OPTIONS=	luajit
.endif

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mluajit)
# JIT needs WX mappings
NOT_PAX_MPROTECT_SAFE+=		love0.10/bin/love
.  include "../../lang/LuaJIT2/buildlink3.mk"
.else
CONFIGURE_ARGS+=		--with-lua=lua
CONFIGURE_ARGS+=		--with-luaversion=-5.1
.  include "../../lang/lua51/buildlink3.mk"
.endif