diff options
author | minskim <minskim> | 2004-12-30 21:56:20 +0000 |
---|---|---|
committer | minskim <minskim> | 2004-12-30 21:56:20 +0000 |
commit | 31211d7decf507968334baa3394eb38a4933d43e (patch) | |
tree | 3c58708ca57a2a5ccd85efb4ce9df4421b020eb8 /lang/python23 | |
parent | 84b102b59b3a16f535cef999748998911cc17df0 (diff) | |
download | pkgsrc-31211d7decf507968334baa3394eb38a4933d43e.tar.gz |
Honor LDFLAGS when building shared libraries on Linux. Previously,
python2[34]{,-pth} failed on Linux when Berkeley DB from pkgsrc was
used.
Diffstat (limited to 'lang/python23')
-rw-r--r-- | lang/python23/distinfo | 4 | ||||
-rw-r--r-- | lang/python23/patches/patch-al | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/lang/python23/distinfo b/lang/python23/distinfo index 4f99222d71d..210c9737a35 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2004/11/28 13:33:19 recht Exp $ +$NetBSD: distinfo,v 1.22 2004/12/30 21:56:20 minskim Exp $ SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3 Size (Python-2.3.4.tgz) = 8502738 bytes @@ -8,7 +8,7 @@ SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9 SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6 SHA1 (patch-ah) = f9a46bfe82acec594cf44afd43f359a5248edadb -SHA1 (patch-al) = af2c7c23a7aec7e305edb0ef41456c5247b87405 +SHA1 (patch-al) = a19c897aedd60e6a437042daf8141ace979774c5 SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3 SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae SHA1 (patch-ca) = 95f5a515fe3dafd75d077e0591e88a34447152ff diff --git a/lang/python23/patches/patch-al b/lang/python23/patches/patch-al index 432450c2bdd..e8192edfc4d 100644 --- a/lang/python23/patches/patch-al +++ b/lang/python23/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $ +$NetBSD: patch-al,v 1.9 2004/12/30 21:56:21 minskim Exp $ ---- configure.orig Fri May 7 21:13:40 2004 -+++ configure Thu Nov 25 13:20:20 2004 -@@ -1440,6 +1440,8 @@ +--- configure.orig 2004-05-07 14:13:40.000000000 -0500 ++++ configure +@@ -1440,6 +1440,8 @@ case $ac_sys_system/$ac_sys_release in # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. OpenBSD/2.* | OpenBSD/3.[01234]) define_xopen_source=no;; @@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $ # On Solaris 2.6, sys/wait.h is inconsistent in the usage # of union __?sigval. Reported by Stuart Bishop. SunOS/5.6) -@@ -3603,7 +3605,7 @@ +@@ -3603,7 +3605,7 @@ _ACEOF RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION ;; @@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -3624,6 +3626,14 @@ +@@ -3624,6 +3626,14 @@ _ACEOF BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib} ;; @@ -35,7 +35,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $ esac # DG/UX requires some fancy ld contortions to produce a .so from an .a case $MACHDEP in -@@ -4021,7 +4031,12 @@ +@@ -4021,7 +4031,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing ;; # is there any other compiler on Darwin besides gcc? Darwin*) @@ -49,7 +49,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $ ;; esac ;; -@@ -10082,7 +10097,7 @@ +@@ -10082,7 +10097,7 @@ then LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python @@ -58,7 +58,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $ fi ;; Darwin/*) LDSHARED='$(CC) $(LDFLAGS) -bundle' -@@ -10091,8 +10106,8 @@ +@@ -10091,10 +10106,10 @@ then LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -67,9 +67,12 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $ + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' fi ;; - Linux*|GNU*) LDSHARED='$(CC) -shared';; +- Linux*|GNU*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';; dgux*) LDSHARED="ld -G";; -@@ -13855,6 +13870,7 @@ + BSD/OS*/4*) LDSHARED="gcc -shared";; + OpenBSD*|FreeBSD*) +@@ -13855,6 +13870,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include "confdefs.h" |