pkgsrc-WIP-changes archive

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

luakit-git: luajit support



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Sat Jan 18 15:17:45 2020 +0000
Changeset:	dd1dfba3433a089bc7bfbc1b627a947a533483d8

Modified Files:
	luakit-git/Makefile
Added Files:
	luakit-git/options.mk

Log Message:
luakit-git: luajit support

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

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

diffstat:
 luakit-git/Makefile   | 17 +++++++----------
 luakit-git/options.mk | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)

diffs:
diff --git a/luakit-git/Makefile b/luakit-git/Makefile
index 75321990e6..37d782cebf 100644
--- a/luakit-git/Makefile
+++ b/luakit-git/Makefile
@@ -16,15 +16,12 @@ GIT_BRANCH.luakit=	develop
 GIT_REPO.luakit=	git://github.com/luakit/luakit
 WRKSRC=			${WRKDIR}/luakit
 
-LUAKIT_MAKE_FLAGS+=	DEVELOPMENT_PATHS=0
-LUAKIT_MAKE_FLAGS+=	APPDIR=${PREFIX}/share/applications
-LUAKIT_MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/luakit
-LUAKIT_MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
-LUAKIT_MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/pixmaps
-LUAKIT_MAKE_FLAGS+=	XDGPREFIX=${PREFIX}/etc/xdg
-LUAKIT_MAKE_FLAGS+=	USE_LUAJIT=0
-BUILD_MAKE_FLAGS+=	${LUAKIT_MAKE_FLAGS}
-INSTALL_MAKE_FLAGS+=	${LUAKIT_MAKE_FLAGS}
+MAKE_FLAGS+=	DEVELOPMENT_PATHS=0
+MAKE_FLAGS+=	APPDIR=${PREFIX}/share/applications
+MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/luakit
+MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/pixmaps
+MAKE_FLAGS+=	XDGPREFIX=${PREFIX}/etc/xdg
 
 LUA_VERSIONS_ACCEPTED=	51
 
@@ -59,8 +56,8 @@ post-build:	teardownx
 pre-install:
 	${RM} -f ${WRKSRC}/lib/*.orig
 
+.include "options.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/luakit-git/options.mk b/luakit-git/options.mk
new file mode 100644
index 0000000000..0e290b2a53
--- /dev/null
+++ b/luakit-git/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.4 2019/10/20 11:10:48 nia Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.luakit
+PKG_SUPPORTED_OPTIONS=		luajit
+PKG_SUGGESTED_OPTIONS=		luajit
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mluajit)
+MAKE_FLAGS+=	USE_LUAJIT=1
+NOT_PAX_MPROTECT_SAFE+=	bin/luakit # LuaJit
+.  include "../../lang/LuaJIT2/buildlink3.mk"
+.else
+MAKE_FLAGS+=	USE_LUAJIT=0
+.  include "../../lang/lua51/buildlink3.mk"
+.endif


Home | Main Index | Thread Index | Old Index