Add LUA_LINKER_MAGIC variable that centrally sets LDFLAGS on Darwin,

as should probably have been done to begin with. Remove per-package hacks.

6 files changed, 6 insertions, 22 deletions

diff --git a/devel/lua-bit32/Makefile b/devel/lua-bit32/Makefile
index 56008b8ed19..e55bed5b896 100644
--- a/devel/lua-bit32/Makefile
+++ b/devel/lua-bit32/Makefile
@@ -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:
diff --git a/devel/lua-compat53/Makefile b/devel/lua-compat53/Makefile
index 926259a9ec2..de0a7e0bf6b 100644
--- a/devel/lua-compat53/Makefile
+++ b/devel/lua-compat53/Makefile
@@ -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}") }
 
diff --git a/devel/lua-event/Makefile b/devel/lua-event/Makefile
index b9b72c473ce..02a5b487190 100644
--- a/devel/lua-event/Makefile
+++ b/devel/lua-event/Makefile
@@ -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
diff --git a/devel/lua-filesystem/Makefile b/devel/lua-filesystem/Makefile
index 927e33b2dd0..52a9a4116fb 100644
--- a/devel/lua-filesystem/Makefile
+++ b/devel/lua-filesystem/Makefile
@@ -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"
diff --git a/devel/lua-posix/Makefile b/devel/lua-posix/Makefile
index ac70f839355..0795a93acad 100644
--- a/devel/lua-posix/Makefile
+++ b/devel/lua-posix/Makefile
@@ -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-9]*:../../devel/lua-std-_debug
 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} && \
diff --git a/devel/lua-term/Makefile b/devel/lua-term/Makefile
index 676be92ae14..9747d5f8da6 100644
--- a/devel/lua-term/Makefile
+++ b/devel/lua-term/Makefile
@@ -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_INCDIR}
 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"