diff options
author | jlam <jlam> | 2001-12-06 03:46:21 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-12-06 03:46:21 +0000 |
commit | d270ec4973a7b6b908df703715ca092e9df8c178 (patch) | |
tree | 1ce49ca50ce3803e7e6f51c9401fe4ba410f9847 /databases | |
parent | 69aa861e23d05ba78faaacf3af9c0e309a98ca56 (diff) | |
download | pkgsrc-d270ec4973a7b6b908df703715ca092e9df8c178.tar.gz |
Add -Wl flags from LDFLAGS to the EXTRA_LIBS. This allows libpq.so to be
found at run-time, as before, the -Wl,-R options that set the run-time
library search path weren't being used. Simply using LDFLAGS without
filtering doesn't work because the configure script appends CFLAGS to
LDFLAGS, and some commonly-used compiler options, e.g. -mcpu=..., which
causes python's makesetup to choke because the options aren't in the list
of recognized linker options. Thanks to D'Arcy J.M. Cain <darcy@druid.net>
for pointing out the error and possible solution.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/postgresql/distinfo | 4 | ||||
-rw-r--r-- | databases/postgresql/patches/patch-ah | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo index 7a4cfd36f16..be522152181 100644 --- a/databases/postgresql/distinfo +++ b/databases/postgresql/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2001/11/04 21:25:48 darcy Exp $ +$NetBSD: distinfo,v 1.9 2001/12/06 03:46:21 jlam Exp $ SHA1 (postgresql-7.1.3.tar.gz) = d969d73af499e87a7ad052cab5efe6ca9d1d7085 Size (postgresql-7.1.3.tar.gz) = 8124455 bytes @@ -9,7 +9,7 @@ SHA1 (patch-ad) = 0c55c66003603c688d727ca7de8fb73fdfdc88ac SHA1 (patch-ae) = ea4f680544bbdae36945b6393f50a0c15df38046 SHA1 (patch-af) = 79f9153c463e6ea81bacc0ec8ba941b0e96e2745 SHA1 (patch-ag) = 64279ce6b8677563e5b6c200fb22c46d5f964f42 -SHA1 (patch-ah) = bd89be830747ede444516f1abf44a0407164fe8d +SHA1 (patch-ah) = 7b280f06009bb5b64526bbf50950ff62abd31766 SHA1 (patch-ai) = 02b84f52941e7cb939388137392df18d53eecfb2 SHA1 (patch-aj) = 251c0f20ca90f6d613f37c0a31d80f3bf38f2bdc SHA1 (patch-ak) = 96f555cfb72a7f263f763afad0120ab45e50d6b6 diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah index 1c978077c20..8ecc7335556 100644 --- a/databases/postgresql/patches/patch-ah +++ b/databases/postgresql/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.8 2001/05/14 14:52:38 jlam Exp $ +$NetBSD: patch-ah,v 1.9 2001/12/06 03:46:22 jlam Exp $ ---- src/interfaces/python/GNUmakefile.orig Sun Apr 1 15:17:33 2001 +--- src/interfaces/python/GNUmakefile.orig Sun Mar 25 14:44:03 2001 +++ src/interfaces/python/GNUmakefile @@ -12,9 +12,22 @@ top_builddir = ../../.. @@ -30,8 +30,9 @@ $NetBSD: patch-ah,v 1.8 2001/05/14 14:52:38 jlam Exp $ Setup.in: Setup.in.raw sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \ -e 's,@libpq_builddir@,$(libpq_builddir),g' \ +- -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(LIBS)%g' \ + -e 's,@libpq@,$(libpq),g' \ - -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(LIBS)%g' \ ++ -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(filter -Wl%, $(LDFLAGS)) $(LIBS)%g' \ -e 's%@INCLUDES@%$(filter -I%, $(CPPFLAGS))%g' \ $< > $@ |