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/python24 | |
| 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/python24')
| -rw-r--r-- | lang/python24/distinfo | 4 | ||||
| -rw-r--r-- | lang/python24/patches/patch-al | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lang/python24/distinfo b/lang/python24/distinfo index eda9c92b571..da5f21e713e 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2004/12/19 05:45:39 grant Exp $ +$NetBSD: distinfo,v 1.4 2004/12/30 21:56:21 minskim Exp $ SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e Size (Python-2.4.tar.bz2) = 7840762 bytes @@ -13,5 +13,5 @@ SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72 -SHA1 (patch-al) = 789a62b0efa9044ea412d6e1ef47c62d9ea0ec1a +SHA1 (patch-al) = 1b91dab1575079c70851150ff0e3ad3d45fe7123 SHA1 (patch-am) = aa71ec2f9cc8f434ff38b19df23b5dd433e13e5a diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al index bd57078e583..0718eed750f 100644 --- a/lang/python24/patches/patch-al +++ b/lang/python24/patches/patch-al @@ -1,6 +1,6 @@ -$NetBSD: patch-al,v 1.3 2004/12/19 05:45:39 grant Exp $ +$NetBSD: patch-al,v 1.4 2004/12/30 21:56:21 minskim Exp $ ---- configure.orig 2004-11-07 12:24:12.000000000 +1100 +--- configure.orig 2004-11-06 19:24:12.000000000 -0600 +++ configure @@ -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. @@ -72,7 +72,7 @@ $NetBSD: patch-al,v 1.3 2004/12/19 05:45:39 grant Exp $ fi ;; Darwin/*) # Use -undefined dynamic_lookup whenever possible (10.3 and later). -@@ -10324,8 +10342,8 @@ then +@@ -10324,12 +10342,12 @@ then LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -83,6 +83,11 @@ $NetBSD: patch-al,v 1.3 2004/12/19 05:45:39 grant Exp $ fi fi ;; +- 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__`" != "" ] @@ -10370,6 +10388,7 @@ then fi;; Linux*|GNU*) CCSHARED="-fPIC";; |