make sure that pkgsrc's LDFLAGS is used when linking

NetBSD · Jan 13, 2007 · d1932d6 · d1932d6
1 parent adbea09
commit d1932d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/04 21:29:30 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2007/01/13 13:50:11 schwarz Exp $
 
 DISTNAME=	zlib-1.2.3
 CATEGORIES=	devel
@@ -17,4 +17,6 @@ USE_LIBTOOL=		yes
 HAS_CONFIGURE=		yes
 INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3
 
+MAKE_ENV+=	PKGSRC_LDFLAGS=${LDFLAGS:Q}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/zlib/distinfo b/devel/zlib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2005/12/27 17:27:58 reed Exp $
+$NetBSD: distinfo,v 1.16 2007/01/13 13:50:11 schwarz Exp $
 
 SHA1 (zlib-1.2.3.tar.gz) = 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902
 RMD160 (zlib-1.2.3.tar.gz) = 89a57e336c24f7f6eebda3a1724e14b71187e117
 Size (zlib-1.2.3.tar.gz) = 496597 bytes
-SHA1 (patch-aa) = 8adea46e6fd1882d7c4956d85399a1bf9e60f1f7
+SHA1 (patch-aa) = 92cafd578d8f97c5e67c48b62c0d8b56b795e6ab
diff --git a/devel/zlib/patches/patch-aa b/devel/zlib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2005/12/27 17:27:58 reed Exp $
+$NetBSD: patch-aa,v 1.10 2007/01/13 13:50:11 schwarz Exp $
 
 --- Makefile.in.orig	2004-09-15 16:27:20.000000000 +0200
 +++ Makefile.in	2005-04-10 12:48:19.000000000 +0200
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.9 2005/12/27 17:27:58 reed Exp $
 -	ln -s $@ $(SHAREDLIB)
 -	ln -s $@ $(SHAREDLIBM)
 +all: $(OBJS)
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o libz.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2
++	${LIBTOOL} --mode=link ${CC} ${CPPFLAGS} ${CFLAGS} ${PKGSRC_LDFLAGS} -o libz.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2
 +
 +.c.o:
 +	${LIBTOOL} --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS} -c $<