diff options
| author | minskim <minskim@pkgsrc.org> | 2004-12-30 21:56:20 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-12-30 21:56:20 +0000 |
| commit | ff7fee44a5fc2f178edc76307b17fd244c962dbf (patch) | |
| tree | 3c58708ca57a2a5ccd85efb4ce9df4421b020eb8 /lang/python24-pth | |
| parent | 97658973a9b94d70647655d298f8c14aa400d5ca (diff) | |
| download | pkgsrc-ff7fee44a5fc2f178edc76307b17fd244c962dbf.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/python24-pth')
| -rw-r--r-- | lang/python24-pth/distinfo | 4 | ||||
| -rw-r--r-- | lang/python24-pth/patches/patch-al | 27 |
2 files changed, 18 insertions, 13 deletions
diff --git a/lang/python24-pth/distinfo b/lang/python24-pth/distinfo index 2179bc3ebb5..b6b813d9004 100644 --- a/lang/python24-pth/distinfo +++ b/lang/python24-pth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/12/05 23:28:53 recht Exp $ +$NetBSD: distinfo,v 1.2 2004/12/30 21:56:21 minskim Exp $ SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e Size (Python-2.4.tar.bz2) = 7840762 bytes @@ -13,6 +13,6 @@ SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72 -SHA1 (patch-al) = ebf8e77f67e69f6aec0b6da254e0169198f0ae8f +SHA1 (patch-al) = 1a48a02ea72b99b4f942abc6c91ceab8fc2ba879 SHA1 (patch-am) = ecb78cf1097531447af7b7fd60166b84b8aef1b4 SHA1 (patch-ba) = d0f9d225bd3de0a7af098fef05d5b09f8319ce7f diff --git a/lang/python24-pth/patches/patch-al b/lang/python24-pth/patches/patch-al index 7d0a9f86c45..de8abeaeea3 100644 --- a/lang/python24-pth/patches/patch-al +++ b/lang/python24-pth/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $ +$NetBSD: patch-al,v 1.2 2004/12/30 21:56:21 minskim Exp $ ---- configure.orig Sun Nov 7 02:24:12 2004 -+++ configure Sun Dec 5 23:03:58 2004 -@@ -1349,7 +1349,7 @@ +--- configure.orig 2004-11-06 19:24:12.000000000 -0600 ++++ configure +@@ -1349,7 +1349,7 @@ rm confdefs.h mv confdefs.h.new confdefs.h @@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $ SOVERSION=1.0 -@@ -1479,6 +1479,8 @@ +@@ -1479,6 +1479,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.[0123456]) define_xopen_source=no;; @@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $ # On Solaris 2.6, sys/wait.h is inconsistent in the usage # of union __?sigval. Reported by Stuart Bishop. SunOS/5.6) -@@ -3418,6 +3420,14 @@ +@@ -3418,6 +3420,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.1.1.1 2004/12/05 23:28:56 recht Exp $ esac else # shared is disabled case $ac_sys_system in -@@ -3816,7 +3826,12 @@ +@@ -3816,7 +3826,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.1.1.1 2004/12/05 23:28:56 recht Exp $ ;; esac ;; -@@ -10295,7 +10310,7 @@ +@@ -10295,7 +10310,7 @@ then LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python @@ -58,7 +58,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $ fi ;; Darwin/1.4*|Darwin/5.*|Darwin/6.*) LDSHARED='$(CC) $(LDFLAGS) -bundle' -@@ -10305,8 +10320,8 @@ +@@ -10305,8 +10320,8 @@ then LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -69,7 +69,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $ fi ;; Darwin/*) # Use -undefined dynamic_lookup whenever possible (10.3 and later). -@@ -10324,8 +10339,8 @@ +@@ -10324,12 +10339,12 @@ then LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -80,7 +80,12 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $ fi fi ;; -@@ -14297,6 +14312,7 @@ +- Linux*|GNU*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';; + BSD/OS*/4*) LDSHARED="gcc -shared";; + OpenBSD*|FreeBSD*) + if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] +@@ -14297,6 +14312,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include "confdefs.h" |