diff options
author | sevan <sevan> | 2016-08-20 18:49:33 +0000 |
---|---|---|
committer | sevan <sevan> | 2016-08-20 18:49:33 +0000 |
commit | bb7bad699d782bf7d4066a3973bac29b969269d6 (patch) | |
tree | 76d12cf7b8a8d1ff4e1cbf37adab963c5b0320de /databases/lua-tokyocabinet | |
parent | 8e1da40f11dbd14b8dd3522ab36e70d25a459483 (diff) | |
download | pkgsrc-bb7bad699d782bf7d4066a3973bac29b969269d6.tar.gz |
Unbreak build on Darwin.
Add flag for Darwin linker to resolve symbols from external libraries at
runtime.
Handle dylib file extension for module.
Add comment to describe patch-aa.
ok alnsn@
Diffstat (limited to 'databases/lua-tokyocabinet')
-rw-r--r-- | databases/lua-tokyocabinet/Makefile | 11 | ||||
-rw-r--r-- | databases/lua-tokyocabinet/PLIST | 4 | ||||
-rw-r--r-- | databases/lua-tokyocabinet/distinfo | 4 | ||||
-rw-r--r-- | databases/lua-tokyocabinet/patches/patch-aa | 17 |
4 files changed, 29 insertions, 7 deletions
diff --git a/databases/lua-tokyocabinet/Makefile b/databases/lua-tokyocabinet/Makefile index ecf95c4c2cf..8e7b7b8ea44 100644 --- a/databases/lua-tokyocabinet/Makefile +++ b/databases/lua-tokyocabinet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/03/15 19:57:40 hiramatsu Exp $ +# $NetBSD: Makefile,v 1.25 2016/08/20 18:49:33 sevan Exp $ # DISTNAME= tokyocabinet-lua-1.10 @@ -25,6 +25,15 @@ INSTALLATION_DIRS+= ${LUA_DOCDIR} ${LUA_EXAMPLESDIR} MAKE_ENV+= INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include +.include "../../mk/bsd.prefs.mk" + +.if ${_OPSYS_SHLIB_TYPE} == "dylib" +SOEXT= dylib +.else +SOEXT= so +.endif +PLIST_SUBST+= SOEXT=${SOEXT} + post-extract: ${CHMOD} -R go-w ${WRKSRC} diff --git a/databases/lua-tokyocabinet/PLIST b/databases/lua-tokyocabinet/PLIST index dd5239dc8bb..c652037154e 100644 --- a/databases/lua-tokyocabinet/PLIST +++ b/databases/lua-tokyocabinet/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/08/20 18:49:33 sevan Exp $ ${LUA_EXAMPLESDIR}/tcbtest.lua ${LUA_EXAMPLESDIR}/tcftest.lua ${LUA_EXAMPLESDIR}/tchtest.lua ${LUA_EXAMPLESDIR}/tcutest.lua -${LUA_CDIR}/tokyocabinet.so +${LUA_CDIR}/tokyocabinet.${SOEXT} ${LUA_DOCDIR}/index.html ${LUA_DOCDIR}/luadoc.css ${LUA_DOCDIR}/modules/tokyocabinet.html diff --git a/databases/lua-tokyocabinet/distinfo b/databases/lua-tokyocabinet/distinfo index 27cddb29c22..916af149a6c 100644 --- a/databases/lua-tokyocabinet/distinfo +++ b/databases/lua-tokyocabinet/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2015/11/03 01:56:14 agc Exp $ +$NetBSD: distinfo,v 1.10 2016/08/20 18:49:33 sevan Exp $ SHA1 (tokyocabinet-lua-1.10.tar.gz) = 4f182f990b53eae3fe78f1dfba0e64cc52316bef RMD160 (tokyocabinet-lua-1.10.tar.gz) = b0cf1183d3e9b9dc07c2cd5c32be06adbe9a1187 SHA512 (tokyocabinet-lua-1.10.tar.gz) = 3e7eb36e603a780ddbd91a575730bced068bb4e35b2fafa75bbadadc59999233007ffa79dcf98428c20fa3b3cd3ee48aba02e498e8c35c23c7f29b3e5f906a9c Size (tokyocabinet-lua-1.10.tar.gz) = 111135 bytes -SHA1 (patch-aa) = a02449c57d232192058c5673fbd3910220db856f +SHA1 (patch-aa) = 10542bcc063a8ff430a108f255c37d125d951c10 SHA1 (patch-ab) = 80aadd7a2ea3caef9a6965c995f526b00b6ff64f SHA1 (patch-tokyocabinet.c) = 329efb1d5529136c1bafec2164ad94a26d818b58 diff --git a/databases/lua-tokyocabinet/patches/patch-aa b/databases/lua-tokyocabinet/patches/patch-aa index e21f2f530cf..f78625026cd 100644 --- a/databases/lua-tokyocabinet/patches/patch-aa +++ b/databases/lua-tokyocabinet/patches/patch-aa @@ -1,6 +1,10 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/01/24 03:04:54 obache Exp $ +$NetBSD: patch-aa,v 1.2 2016/08/20 18:49:33 sevan Exp $ ---- Makefile.in.orig 2008-10-12 04:17:48.000000000 +0000 +- Add place holder for flags which can be passed in from pkgsrc. +- Add flag for Darwin linker to resolve symbols from external libraries at +runtime. + +--- Makefile.in.orig 2009-07-19 04:35:10.000000000 +0000 +++ Makefile.in @@ -32,9 +32,9 @@ DESTDIR = @@ -15,3 +19,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/01/24 03:04:54 obache Exp $ LIBS = @LIBS@ LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ +@@ -181,7 +181,7 @@ tokyocabinet.so : $(LIBOBJFILES) + + + tokyocabinet.dylib : $(LIBOBJFILES) +- $(CC) $(CFLAGS) -dynamiclib -o $@ $(LIBOBJFILES) $(LDFLAGS) $(LIBS) ++ $(CC) $(CFLAGS) -dynamiclib -undefined dynamic_lookup -o $@ $(LIBOBJFILES) $(LDFLAGS) $(LIBS) + + + |