summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2005-03-03 07:51:40 +0000
committergrant <grant@pkgsrc.org>2005-03-03 07:51:40 +0000
commitbff0c11faaa1a021bc4502ca9122abe77eadc75d (patch)
tree49f959ab1821e4bc19d7ab6141c5f04fff26230d
parent675804295b2e29f3c7ee8a9500b2c718a2a08f35 (diff)
downloadpkgsrc-bff0c11faaa1a021bc4502ca9122abe77eadc75d.tar.gz
don't attempt to statically link system libraries.
from Eric Boutilier in PR pkg/29470.
-rw-r--r--devel/popt/distinfo4
-rw-r--r--devel/popt/patches/patch-ab20
2 files changed, 14 insertions, 10 deletions
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index a242f6bbe88..df17c54e26c 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2005/02/23 22:24:31 agc Exp $
+$NetBSD: distinfo,v 1.16 2005/03/03 07:51:40 grant Exp $
SHA1 (popt-1.7.tar.gz) = 66f3c77b87a160951b180447f4a6dce68ad2f71b
RMD160 (popt-1.7.tar.gz) = 2942c28d82607501d5ae595063da27599b5b93da
Size (popt-1.7.tar.gz) = 574549 bytes
-SHA1 (patch-ab) = e3f4376c7090b59fbe4b2ef4404560f28bcc3079
+SHA1 (patch-ab) = a4bb5b3bd08b2bb6591345e68be7fea380de9d65
SHA1 (patch-ac) = d95914024999789d60bd530865bb8613ed13f17c
SHA1 (patch-ad) = 33ac94c57ad05d2fe99c9620181b59ce1402c21e
SHA1 (patch-ae) = 4ed189cb6b91a334e56be266ecfc90e3099b6564
diff --git a/devel/popt/patches/patch-ab b/devel/popt/patches/patch-ab
index d9a10bc9580..56dbfb91195 100644
--- a/devel/popt/patches/patch-ab
+++ b/devel/popt/patches/patch-ab
@@ -1,25 +1,29 @@
-$NetBSD: patch-ab,v 1.5 2003/11/12 01:25:25 salo Exp $
+$NetBSD: patch-ab,v 1.6 2005/03/03 07:51:40 grant Exp $
---- Makefile.in.orig 2002-08-31 15:22:18.000000000 +0200
-+++ Makefile.in 2003-11-11 16:20:23.000000000 +0100
-@@ -133,13 +133,13 @@
+--- Makefile.in.orig 2002-08-31 23:22:18.000000000 +1000
++++ Makefile.in
+@@ -132,14 +132,14 @@ noinst_HEADERS = findme.h poptint.h syst
+
noinst_PROGRAMS = test1 test2 test3
test1_SOURCES = test1.c
- test1_LDFLAGS = -all-static
+-test1_LDFLAGS = -all-static
-test1_LDADD = $(lib_LTLIBRARIES)
++test1_LDFLAGS =
+test1_LDADD = $(lib_LTLIBRARIES) $(LIBINTL)
test2_SOURCES = test2.c
- test2_LDFLAGS = -all-static
+-test2_LDFLAGS = -all-static
-test2_LDADD = $(lib_LTLIBRARIES)
++test2_LDFLAGS =
+test2_LDADD = $(lib_LTLIBRARIES) $(LIBINTL)
test3_SOURCES = test3.c
- test3_LDFLAGS = -all-static
+-test3_LDFLAGS = -all-static
-test3_LDADD = $(lib_LTLIBRARIES)
++test3_LDFLAGS =
+test3_LDADD = $(lib_LTLIBRARIES) $(LIBINTL)
noinst_SCRIPTS = testit.sh
-@@ -187,7 +187,7 @@
+@@ -187,7 +187,7 @@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@