pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

love11: Clean up includes, support building w/o luajit



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Wed Jun 24 17:02:30 2020 +0100
Changeset:	6e6c23be72614f0ff3f61925a9595ef36a672f25

Modified Files:
	love11/Makefile
Added Files:
	love11/options.mk

Log Message:
love11: Clean up includes, support building w/o luajit

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6e6c23be72614f0ff3f61925a9595ef36a672f25

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 love11/Makefile   | 22 ++++++++--------------
 love11/options.mk | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 14 deletions(-)

diffs:
diff --git a/love11/Makefile b/love11/Makefile
index fcf0b2d08d..5abb6dbd5d 100644
--- a/love11/Makefile
+++ b/love11/Makefile
@@ -16,33 +16,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-linux-src//}
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 
+# checking whether gcc version is at least 4.7...
+GCC_REQD+=	4.7
+
 USE_TOOLS+=	pkg-config
 USE_LIBTOOL=	yes
 
-LUA_VERSIONS_INCOMPATIBLE=	52 53
-
-# JIT needs WX mappings
-NOT_PAX_MPROTECT_SAFE+=		love11/bin/love
-
 GNU_CONFIGURE_PREFIX=		${PREFIX}/love11
 GNU_CONFIGURE_MANDIR=		${PREFIX}/love11/${PKGMANDIR}/
 BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/love11/lib
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/love11/lib
 
+.include "options.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../audio/libmodplug/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../audio/libmodplug/buildlink3.mk"
-.include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../audio/mpg123/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/love11/options.mk b/love11/options.mk
new file mode 100644
index 0000000000..74879fd924
--- /dev/null
+++ b/love11/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.2 2020/06/24 13:32:09 nia Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.love
+
+.include "../../lang/LuaJIT2/platform.mk"
+.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
+PKG_SUPPORTED_OPTIONS=	luajit
+PKG_SUGGESTED_OPTIONS=	luajit
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mluajit)
+# JIT needs WX mappings
+NOT_PAX_MPROTECT_SAFE+=		love11/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


Home | Main Index | Thread Index | Old Index