diff options
| author | alnsn <alnsn@pkgsrc.org> | 2015-12-06 00:25:26 +0000 |
|---|---|---|
| committer | alnsn <alnsn@pkgsrc.org> | 2015-12-06 00:25:26 +0000 |
| commit | 99476051dd426bbdc2880d7c6d0832ac4362d0e9 (patch) | |
| tree | 3a10b02a7942b11565696c464d3379c5e2cd87ae /lang/lua52 | |
| parent | 045f3cd576ac84d4704d3f39b712147cb454775c (diff) | |
| download | pkgsrc-99476051dd426bbdc2880d7c6d0832ac4362d0e9.tar.gz | |
Fix pkg/47587 lua not linked to pthread causes issues with modules.
Diffstat (limited to 'lang/lua52')
| -rw-r--r-- | lang/lua52/Makefile | 13 | ||||
| -rw-r--r-- | lang/lua52/distinfo | 4 | ||||
| -rw-r--r-- | lang/lua52/patches/patch-ab | 8 |
3 files changed, 19 insertions, 6 deletions
diff --git a/lang/lua52/Makefile b/lang/lua52/Makefile index 25992a9e9e2..d0db9c16a41 100644 --- a/lang/lua52/Makefile +++ b/lang/lua52/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2015/03/08 10:55:19 alnsn Exp $ +# $NetBSD: Makefile,v 1.9 2015/12/06 00:25:26 alnsn Exp $ DISTNAME= lua-${LUA_VERSION} PKGNAME= lua52-${LUA_VERSION} +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ http://www.tecgraf.puc-rio.br/lua/ftp/ @@ -23,6 +24,16 @@ MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q} MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\" +# pkg/47587 lua not linked to pthread causes issues with modules +PTHREAD_OPTS+= native + +.include "../../mk/pthread.buildlink3.mk" + +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native" +CFLAGS+= -pthread +LDFLAGS+= -pthread +.endif + PKGCONFIG_OVERRIDE= ${WRKSRC}/lua.pc INSTALLATION_DIRS+= lib/pkgconfig share/doc/lua-5.2 diff --git a/lang/lua52/distinfo b/lang/lua52/distinfo index 1a12711d936..21bb25bb58a 100644 --- a/lang/lua52/distinfo +++ b/lang/lua52/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.7 2015/11/03 22:50:38 agc Exp $ +$NetBSD: distinfo,v 1.8 2015/12/06 00:25:26 alnsn Exp $ SHA1 (lua-5.2.4.tar.gz) = ef15259421197e3d85b7d6e4871b8c26fd82c1cf RMD160 (lua-5.2.4.tar.gz) = 3bad2da85f354132da6a53b45882006f0a451b5c SHA512 (lua-5.2.4.tar.gz) = cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c Size (lua-5.2.4.tar.gz) = 252651 bytes SHA1 (patch-aa) = ce0763ed1515f670b8a5d543af3753320cf06309 -SHA1 (patch-ab) = 498dac3f444ccf6f6dff22c4644b8123865f3a9d +SHA1 (patch-ab) = c88a72c20924021622aa285a8992a3d8122bcbad SHA1 (patch-ac) = b8b9c0068210795e5eb22512767ac2e98bca8cbc SHA1 (patch-src_liolib.c) = e85afa1ab7060be2c027ecd619fd9c9fd721a8b5 SHA1 (patch-src_lua.c) = 393ef8161b28e201abd5b27d7c4c92b19de4601e diff --git a/lang/lua52/patches/patch-ab b/lang/lua52/patches/patch-ab index 39c366319c1..6f308acfd4a 100644 --- a/lang/lua52/patches/patch-ab +++ b/lang/lua52/patches/patch-ab @@ -1,17 +1,19 @@ -$NetBSD: patch-ab,v 1.3 2015/03/05 13:39:20 ryoon Exp $ +$NetBSD: patch-ab,v 1.4 2015/12/06 00:25:26 alnsn Exp $ --- src/Makefile.orig 2013-11-11 11:45:49.000000000 +0000 +++ src/Makefile -@@ -6,8 +6,7 @@ +@@ -6,9 +6,8 @@ # Your platform. See PLATS for possible values. PLAT= none -CC= gcc -CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) +-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) +CFLAGS+= -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) ++LDFLAGS+= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) + AR= ar rcu @@ -24,23 +23,28 @@ MYLDFLAGS= MYLIBS= MYOBJS= |