diff options
| author | adam <adam> | 2011-01-19 13:46:13 +0000 |
|---|---|---|
| committer | adam <adam> | 2011-01-19 13:46:13 +0000 |
| commit | 1a7ee245b935f641ce88630760016f022077975c (patch) | |
| tree | d5187227698f5ee90d1f85639f1f37a6f073871e /lang | |
| parent | 6d0159d019424e87fede6b296745c10f7c81f08c (diff) | |
| download | pkgsrc-1a7ee245b935f641ce88630760016f022077975c.tar.gz | |
Pass LDFLAGS during linking; pkglint clean-up
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/lua/Makefile | 5 | ||||
| -rw-r--r-- | lang/lua/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/lua/distinfo | 4 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ab | 6 |
4 files changed, 10 insertions, 9 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile index 175d08dfab0..e9febfe88be 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2009/11/05 18:03:49 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2011/01/19 13:46:13 adam Exp $ DISTNAME= lua-${LUA_VERSION} PKGREVISION= 2 @@ -54,6 +54,8 @@ BUILD_TARGET= generic PKGCONFIG_OVERRIDE= ${WRKSRC}/etc/lua.pc +INSTALLATION_DIRS+= lib/pkgconfig + SUBST_CLASSES+= pc-prefix SUBST_FILES.pc-prefix+= ${WRKSRC}/etc/lua.pc SUBST_SED.pc-prefix+= -e "s,/usr/local,${PREFIX}," @@ -79,7 +81,6 @@ post-install: cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \ ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc; \ done - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig .include "../../devel/readline/buildlink3.mk" diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk index 7e7d55d71c4..5dfb94bd40f 100644 --- a/lang/lua/buildlink3.mk +++ b/lang/lua/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/05/20 00:58:19 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2011/01/19 13:46:13 adam Exp $ BUILDLINK_TREE+= lua @@ -6,7 +6,7 @@ BUILDLINK_TREE+= lua LUA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.lua+= lua>=5.1.1 -BUILDLINK_ABI_DEPENDS.lua?= lua>=5.1.4nb1 +BUILDLINK_ABI_DEPENDS.lua+= lua>=5.1.4nb1 BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua .include "../../devel/readline/buildlink3.mk" diff --git a/lang/lua/distinfo b/lang/lua/distinfo index 1ea8b049538..ea1858110b6 100644 --- a/lang/lua/distinfo +++ b/lang/lua/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.26 2010/05/28 05:35:50 dholland Exp $ +$NetBSD: distinfo,v 1.27 2011/01/19 13:46:13 adam Exp $ SHA1 (lua-5.1.4.tar.gz) = 2b11c8e60306efb7f0734b747588f57995493db7 RMD160 (lua-5.1.4.tar.gz) = c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef Size (lua-5.1.4.tar.gz) = 216679 bytes SHA1 (patch-aa) = 25bcd22d3fc319c51356b7f976d0215eb04900db -SHA1 (patch-ab) = c5d35cbef2be7c3e2d41209c6656beacc0aa0415 +SHA1 (patch-ab) = b1a68274b67d985dd23d9eb031a7f36acefe6adf SHA1 (patch-ac) = a7cd4d0cce86b511481a6ef681aec64d97e3414e diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab index a7f97428e72..2ccebf58ba4 100644 --- a/lang/lua/patches/patch-ab +++ b/lang/lua/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.12 2009/12/17 16:42:46 jmmv Exp $ +$NetBSD: patch-ab,v 1.13 2011/01/19 13:46:14 adam Exp $ --- src/Makefile.orig 2008-01-19 19:37:58.000000000 +0000 +++ src/Makefile 2009-12-17 16:36:51.000000000 +0000 @@ -61,11 +61,11 @@ $NetBSD: patch-ab,v 1.12 2009/12/17 16:42:46 jmmv Exp $ $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+ ${LIBTOOL} --tag=CC --mode=link $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++ ${LIBTOOL} --tag=CC --mode=link $(CC) -o $@ ${LDFLAGS} $(LUA_O) $(LUA_A) $(LIBS) $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -+ ${LIBTOOL} --tag=CC --mode=link $(CC) -static -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) ++ ${LIBTOOL} --tag=CC --mode=link $(CC) -static -o $@ ${LDFLAGS} $(LUAC_O) $(LUA_A) $(LIBS) clean: $(RM) $(ALL_T) $(ALL_O) |