Received: by mail.netbsd.org (Postfix, from userid 605) id 4262084DC8; Sat, 11 Jul 2020 15:14:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BFC0884DB5 for ; Sat, 11 Jul 2020 15:14:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id HoSQnsaLDnyr for ; Sat, 11 Jul 2020 15:14:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id CC97384CEA for ; Sat, 11 Jul 2020 15:14:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C5E25FB28; Sat, 11 Jul 2020 15:14:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1594480470105030" MIME-Version: 1.0 Date: Sat, 11 Jul 2020 15:14:30 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200711151430.C5E25FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1594480470105030 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Jul 11 15:14:30 UTC 2020 Modified Files: pkgsrc/archivers/lua-zlib: Makefile pkgsrc/databases/lua-lsqlite3: Makefile pkgsrc/devel/lua-bit32: Makefile pkgsrc/devel/lua-compat53: Makefile pkgsrc/devel/lua-event: Makefile pkgsrc/devel/lua-filesystem: Makefile pkgsrc/devel/lua-posix: Makefile pkgsrc/devel/lua-term: Makefile pkgsrc/lang/lua: module.mk pkgsrc/net/lua-socket: Makefile pkgsrc/textproc/lua-cjson: Makefile pkgsrc/textproc/lua-lyaml: Makefile pkgsrc/textproc/lua-utf8: Makefile Log Message: Add LUA_LINKER_MAGIC variable that centrally sets LDFLAGS on Darwin, as should probably have been done to begin with. Remove per-package hacks. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/lua-zlib/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/lua-lsqlite3/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/lua-bit32/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/lua-compat53/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/lua-event/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/lua-filesystem/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/lua-posix/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/lua-term/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/lua/module.mk cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/lua-socket/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/lua-cjson/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/lua-lyaml/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/lua-utf8/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1594480470105030 Content-Disposition: inline Content-Length: 9678 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/lua-zlib/Makefile diff -u pkgsrc/archivers/lua-zlib/Makefile:1.4 pkgsrc/archivers/lua-zlib/Makefile:1.5 --- pkgsrc/archivers/lua-zlib/Makefile:1.4 Sat Jul 11 14:30:25 2020 +++ pkgsrc/archivers/lua-zlib/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/07/11 14:30:25 nia Exp $ +# $NetBSD: Makefile,v 1.5 2020/07/11 15:14:29 nia Exp $ DISTNAME= lua-zlib-1.2 PKGNAME= ${DISTNAME:S/lua-/${LUA_PKGPREFIX}-/1} @@ -17,12 +17,7 @@ BUILD_TARGET= zlib.so MAKE_FLAGS+= CC=${CC} MAKE_FLAGS+= LD=${CC} MAKE_FLAGS+= CFLAGS="${CFLAGS} -fPIC" - -.if ${OPSYS} == "Darwin" -MAKE_FLAGS+= LDFLAGS="${LDFLAGS} -shared -undefined dynamic_lookup" -.else MAKE_FLAGS+= LDFLAGS="${LDFLAGS} -shared" -.endif INSTALLATION_DIRS+= ${LUA_CDIR} Index: pkgsrc/databases/lua-lsqlite3/Makefile diff -u pkgsrc/databases/lua-lsqlite3/Makefile:1.3 pkgsrc/databases/lua-lsqlite3/Makefile:1.4 --- pkgsrc/databases/lua-lsqlite3/Makefile:1.3 Sat Jul 11 14:48:57 2020 +++ pkgsrc/databases/lua-lsqlite3/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/11 15:14:29 nia Exp $ DISTNAME= lsqlite3_fsl09y PKGNAME= ${LUA_PKGPREFIX}-lsqlite3-0.9.5 @@ -11,8 +11,6 @@ HOMEPAGE= http://lua.sqlite.org/index.cg COMMENT= Binding for Lua to the SQLite3 database library LICENSE= mit -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - INSTALLATION_DIRS+= ${LUA_CDIR} ${LUA_LDIR} INSTALLATION_DIRS+= ${LUA_DOCDIR}/examples Index: pkgsrc/devel/lua-bit32/Makefile diff -u pkgsrc/devel/lua-bit32/Makefile:1.3 pkgsrc/devel/lua-bit32/Makefile:1.4 --- pkgsrc/devel/lua-bit32/Makefile:1.3 Sat Jul 11 14:48:57 2020 +++ pkgsrc/devel/lua-bit32/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/11 15:14:29 nia Exp $ # Keep versioning in sync with the luarocks rockspec. DISTNAME= lua-compat53-0.9 @@ -16,8 +16,6 @@ LICENSE= mit CONFLICTS+= ${LUA_PKGPREFIX}-bitlib-[0-9]* SUPERSEDES+= ${LUA_PKGPREFIX}-bitlib-[0-9]* -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - INSTALLATION_DIRS+= ${LUA_CDIR} pre-build: Index: pkgsrc/devel/lua-compat53/Makefile diff -u pkgsrc/devel/lua-compat53/Makefile:1.4 pkgsrc/devel/lua-compat53/Makefile:1.5 --- pkgsrc/devel/lua-compat53/Makefile:1.4 Sat Jul 11 14:48:57 2020 +++ pkgsrc/devel/lua-compat53/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/07/11 14:48:57 nia Exp $ +# $NetBSD: Makefile,v 1.5 2020/07/11 15:14:29 nia Exp $ DISTNAME= lua-compat53-0.9 PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1} @@ -14,8 +14,6 @@ LICENSE= mit PLIST_SUBST+= LUA_INCDIR=${LUA_INCDIR} -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - PRINT_PLIST_AWK+= /^${LUA_INCDIR:S|/|\\/|g}/ \ { gsub(/${LUA_INCDIR:S|/|\\/|g}/, "$${LUA_INCDIR}") } Index: pkgsrc/devel/lua-event/Makefile diff -u pkgsrc/devel/lua-event/Makefile:1.3 pkgsrc/devel/lua-event/Makefile:1.4 --- pkgsrc/devel/lua-event/Makefile:1.3 Sat Jul 11 14:48:57 2020 +++ pkgsrc/devel/lua-event/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/11 15:14:29 nia Exp $ DISTNAME= luaevent-0.4.6 PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua//1} @@ -14,8 +14,6 @@ LICENSE= mit BUILD_DIRS+= src -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - INSTALLATION_DIRS+= ${LUA_DOCDIR} INSTALLATION_DIRS+= ${LUA_DOCDIR}/modules INSTALLATION_DIRS+= ${LUA_CDIR}/luaevent Index: pkgsrc/devel/lua-filesystem/Makefile diff -u pkgsrc/devel/lua-filesystem/Makefile:1.17 pkgsrc/devel/lua-filesystem/Makefile:1.18 --- pkgsrc/devel/lua-filesystem/Makefile:1.17 Sat Jul 11 14:48:58 2020 +++ pkgsrc/devel/lua-filesystem/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2020/07/11 14:48:58 nia Exp $ +# $NetBSD: Makefile,v 1.18 2020/07/11 15:14:29 nia Exp $ # DISTNAME= luafilesystem-1.8.0 @@ -25,7 +25,5 @@ MAKE_FLAGS+= CC=${CC} MAKE_FLAGS+= CFLAGS="${CFLAGS} -fPIC" MAKE_FLAGS+= LUA_VERSION=${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - .include "../../lang/lua/module.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/lua-posix/Makefile diff -u pkgsrc/devel/lua-posix/Makefile:1.21 pkgsrc/devel/lua-posix/Makefile:1.22 --- pkgsrc/devel/lua-posix/Makefile:1.21 Sat Jul 11 14:48:58 2020 +++ pkgsrc/devel/lua-posix/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2020/07/11 14:48:58 nia Exp $ +# $NetBSD: Makefile,v 1.22 2020/07/11 15:14:29 nia Exp $ DISTNAME= luaposix-34.1.1 PKGNAME= ${DISTNAME:S/lua/${LUA_PKGPREFIX}-/} @@ -24,13 +24,7 @@ DEPENDS+= ${LUA_PKGPREFIX}-std-_debug-[0 DEPENDS+= lua51-bit32-[0-9]*:../../devel/lua-bit32 .endif -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" -LIBFLAG+= ${LDFLAGS} -fPIC -bundle -undefined dynamic_lookup -.else LIBFLAG+= ${LDFLAGS} -shared -fPIC -.endif do-build: cd ${WRKSRC} && \ Index: pkgsrc/devel/lua-term/Makefile diff -u pkgsrc/devel/lua-term/Makefile:1.4 pkgsrc/devel/lua-term/Makefile:1.5 --- pkgsrc/devel/lua-term/Makefile:1.4 Sat Jul 11 14:48:58 2020 +++ pkgsrc/devel/lua-term/Makefile Sat Jul 11 15:14:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/07/11 14:48:58 nia Exp $ +# $NetBSD: Makefile,v 1.5 2020/07/11 15:14:29 nia Exp $ DISTNAME= lua-term-0.07 PKGNAME= ${DISTNAME:S/lua/${LUA_PKGPREFIX}/} @@ -19,7 +19,5 @@ MAKE_FLAGS+= LUA_INC=${PREFIX}/${LUA_INC MAKE_FLAGS+= LUA_LIBDIR=${PREFIX}/${LUA_CDIR}/term MAKE_FLAGS+= LUA_SHARE=${PREFIX}/${LUA_LDIR}/term -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - .include "../../lang/lua/module.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/lua/module.mk diff -u pkgsrc/lang/lua/module.mk:1.8 pkgsrc/lang/lua/module.mk:1.9 --- pkgsrc/lang/lua/module.mk:1.8 Thu Jul 9 15:01:53 2020 +++ pkgsrc/lang/lua/module.mk Sat Jul 11 15:14:30 2020 @@ -1,8 +1,20 @@ -# $NetBSD: module.mk,v 1.8 2020/07/09 15:01:53 nia Exp $ +# $NetBSD: module.mk,v 1.9 2020/07/11 15:14:30 nia Exp $ # # This Makefile fragment is intended to be included by packages that # install Lua modules. # +# === Package-settable variables === +# +# LUA_LINKER_MAGIC +# This appends LDFLAGS to properly link Lua modules on non-ELF +# linkers. +# +# You probably want to set this to "no" if the package links +# binaries that are not Lua modules. +# +# Possible values: yes no +# Default: yes +# # === Defined variables === # # LUA_LDIR @@ -56,6 +68,11 @@ PRINT_PLIST_AWK+= /^${LUA_DOCDIR:S|/|\\/ LUA_EXAMPLESDIR= share/examples/${PKGBASE} PLIST_SUBST+= LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR} +LUA_LINKER_MAGIC?= yes + +.if !empty(LUA_LINKER_MAGIC:M[yY][eE][sS]) LDFLAGS.Cygwin+= -llua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} +LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup +.endif .endif # LUA_MODULE_MK Index: pkgsrc/net/lua-socket/Makefile diff -u pkgsrc/net/lua-socket/Makefile:1.12 pkgsrc/net/lua-socket/Makefile:1.13 --- pkgsrc/net/lua-socket/Makefile:1.12 Sat Jul 11 14:51:02 2020 +++ pkgsrc/net/lua-socket/Makefile Sat Jul 11 15:14:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2020/07/11 14:51:02 nia Exp $ +# $NetBSD: Makefile,v 1.13 2020/07/11 15:14:30 nia Exp $ DISTNAME= luasocket-3.0-rc1 PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/} @@ -13,7 +13,6 @@ LICENSE= mit MAKE_FILE= makefile -LDFLAGS.Darwin= -bundle -undefined dynamic_lookup LDFLAGS.SunOS= -lrt -lresolv MAKE_FLAGS+= LUAV=${_LUA_DOT_VERSION} Index: pkgsrc/textproc/lua-cjson/Makefile diff -u pkgsrc/textproc/lua-cjson/Makefile:1.7 pkgsrc/textproc/lua-cjson/Makefile:1.8 --- pkgsrc/textproc/lua-cjson/Makefile:1.7 Sat Jul 11 14:52:19 2020 +++ pkgsrc/textproc/lua-cjson/Makefile Sat Jul 11 15:14:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2020/07/11 14:52:19 nia Exp $ +# $NetBSD: Makefile,v 1.8 2020/07/11 15:14:30 nia Exp $ DISTNAME= lua-cjson-2.1.0 PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1} @@ -15,8 +15,6 @@ USE_TOOLS+= gmake MAKE_ENV+= LUA_CDIR=${LUA_CDIR} -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - INSTALLATION_DIRS= ${LUA_CDIR} do-install: Index: pkgsrc/textproc/lua-lyaml/Makefile diff -u pkgsrc/textproc/lua-lyaml/Makefile:1.3 pkgsrc/textproc/lua-lyaml/Makefile:1.4 --- pkgsrc/textproc/lua-lyaml/Makefile:1.3 Sat Jul 11 14:48:57 2020 +++ pkgsrc/textproc/lua-lyaml/Makefile Sat Jul 11 15:14:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/11 15:14:30 nia Exp $ DISTNAME= lyaml-6.2.5 PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME} @@ -16,8 +16,6 @@ BUILD_DIRS= ext/yaml MAKE_FLAGS+= PKGVERSION=${PKGVERSION} -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - INSTALLATION_DIRS+= ${LUA_DOCDIR} INSTALLATION_DIRS+= ${LUA_CDIR} INSTALLATION_DIRS+= ${LUA_LDIR}/lyaml Index: pkgsrc/textproc/lua-utf8/Makefile diff -u pkgsrc/textproc/lua-utf8/Makefile:1.3 pkgsrc/textproc/lua-utf8/Makefile:1.4 --- pkgsrc/textproc/lua-utf8/Makefile:1.3 Sat Jul 11 14:48:57 2020 +++ pkgsrc/textproc/lua-utf8/Makefile Sat Jul 11 15:14:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/11 15:14:30 nia Exp $ DISTNAME= lua-utf8-0.1.2 PKGNAME= ${DISTNAME:S/lua-/${LUA_PKGPREFIX}-/1} @@ -13,8 +13,6 @@ LICENSE= mit WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV} -LDFLAGS.Darwin+= -bundle -undefined dynamic_lookup - INSTALLATION_DIRS+= ${LUA_CDIR} pre-build: --_----------=_1594480470105030--