summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2001-07-15 22:38:15 +0000
committerjlam <jlam>2001-07-15 22:38:15 +0000
commit543f2dd28ee8505f629b37ba135897d22e218126 (patch)
tree083f538fc46b33fab9e26b813f9b5c5df6be77c7
parent136d2812c2a33143d7da0c9bb97e5e676a2d2c24 (diff)
downloadpkgsrc-543f2dd28ee8505f629b37ba135897d22e218126.tar.gz
Pass LDFLAGS through to compilation of popt library. Fixes pkg/13476 by
Matthew Herzog <kimwana@felt.ne.mediaone.net>.
-rw-r--r--misc/rpm/distinfo4
-rw-r--r--misc/rpm/patches/patch-bc13
2 files changed, 13 insertions, 4 deletions
diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo
index 902b23b567d..02dce129832 100644
--- a/misc/rpm/distinfo
+++ b/misc/rpm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/07/14 06:35:11 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/07/15 22:38:15 jlam Exp $
SHA1 (rpm-2.5.4.tar.gz) = a7fcd67883aec8d5f17483d5efebe7e5f5453462
Size (rpm-2.5.4.tar.gz) = 727849 bytes
@@ -7,5 +7,5 @@ SHA1 (patch-ab) = 63635f4f7fd96b4e7a40bfbaffd5673b40db3a13
SHA1 (patch-ac) = 4dc758cefefb6d97f9217c6c43943883820b1af8
SHA1 (patch-ba) = edf6708fe7ef3b0e899473a13fe709d8c561e14b
SHA1 (patch-bb) = dc0ea2dd366b793003218858ca3d67bc285a2089
-SHA1 (patch-bc) = 7b01437e0fa15ae802dfd7cde4c250fb081ef71c
+SHA1 (patch-bc) = 95a27125f8e17a5433bab273958d49ec3e0f3376
SHA1 (patch-bd) = 1c9cd4587314ee45bccdf08c6ecaabbe641aaa5d
diff --git a/misc/rpm/patches/patch-bc b/misc/rpm/patches/patch-bc
index b1bad830c20..9cbc8e963c2 100644
--- a/misc/rpm/patches/patch-bc
+++ b/misc/rpm/patches/patch-bc
@@ -1,7 +1,16 @@
-$NetBSD: patch-bc,v 1.1 1998/11/05 01:34:02 mycroft Exp $
+$NetBSD: patch-bc,v 1.2 2001/07/15 22:38:15 jlam Exp $
--- popt/Makefile.in.orig Sun Sep 27 10:57:03 1998
-+++ popt/Makefile.in Wed Nov 4 20:11:39 1998
++++ popt/Makefile.in
+@@ -16,7 +16,7 @@
+ LIBS=$(prefix)/lib
+ INCLUDE=$(prefix)/include
+ CPP=@CPP@
+-LDFLAGS=@LIBS@
++LDFLAGS=@LDFLAGS@ @LIBS@
+ TESTCASES=test1
+
+ VERSION=$(shell awk '/define version/ { print $$3 }' popt.spec)
@@ -63,8 +63,8 @@
install:
mkdir -p $(PREFIX)/$(INCLUDE)