diff options
| author | obache <obache@pkgsrc.org> | 2010-12-25 05:45:15 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-12-25 05:45:15 +0000 |
| commit | c3ed7c210ddb8cd1a2dcbc5f4d94bba5c6bffc68 (patch) | |
| tree | e5c03aada8a42241ea018a84293cc516d1c9d963 /lang | |
| parent | fa7586f1efa6dd50b4a7c6503bf16e42209d77f2 (diff) | |
| download | pkgsrc-c3ed7c210ddb8cd1a2dcbc5f4d94bba5c6bffc68.tar.gz | |
* Remove a redundant hunk for Darwin,
* Use $(CC) for LDSHARED on NetBSD and DragonFly like any other.
Fixes PR#42598 for that libpython will be linked with sufficient flags.
Bump PKGREVISION.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python26/Makefile | 4 | ||||
| -rw-r--r-- | lang/python26/distinfo | 4 | ||||
| -rw-r--r-- | lang/python26/patches/patch-al | 26 |
3 files changed, 14 insertions, 20 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 3847083b46d..c76f61d8461 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2010/11/23 08:24:04 tron Exp $ +# $NetBSD: Makefile,v 1.32 2010/12/25 05:45:15 obache Exp $ .include "dist.mk" PKGNAME= python26-${PY_DISTVERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 91569760727..7d390728938 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2010/11/23 08:24:04 tron Exp $ +$NetBSD: distinfo,v 1.30 2010/12/25 05:45:15 obache Exp $ SHA1 (Python-2.6.6.tar.bz2) = a1daf2c2c7cffe0939c015260447572fe75c7e50 RMD160 (Python-2.6.6.tar.bz2) = 2d63f4f0ad3c124a8e62215ca94bd0231350e912 @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2 SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 -SHA1 (patch-al) = e5bf2a7f50534a18bb18f7111b3c5d097b528778 +SHA1 (patch-al) = b2488dc3b33a84ccc96d1dd98d1426f181e461f5 SHA1 (patch-am) = 60c108d05a16c531ee6cf99e5c7ad9a5f27c5f01 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al index b9664275fe9..1904b5499a7 100644 --- a/lang/python26/patches/patch-al +++ b/lang/python26/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.5 2010/09/04 05:12:00 obache Exp $ +$NetBSD: patch-al,v 1.6 2010/12/25 05:45:15 obache Exp $ --- configure.orig 2010-05-25 02:27:03.000000000 +0000 +++ configure -@@ -4736,17 +4736,18 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> +@@ -4736,15 +4736,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION ;; @@ -18,16 +18,8 @@ $NetBSD: patch-al,v 1.5 2010/09/04 05:12:00 obache Exp $ - esac INSTSONAME="$LDLIBRARY".$SOVERSION ;; -+ Darwin*) -+ LDLIBRARY='libpython$(VERSION).dylib' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=DYLD_FALLBACK_LIBRARY_PATH=`pwd`:${DYLD_FALLBACK_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY" -+ ;; hp*|HP*) - case `uname -m` in - ia64) -@@ -7359,8 +7360,8 @@ then +@@ -7359,8 +7354,8 @@ then LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -38,7 +30,7 @@ $NetBSD: patch-al,v 1.5 2010/09/04 05:12:00 obache Exp $ fi ;; Darwin/*) # Use -undefined dynamic_lookup whenever possible (10.3 and later). -@@ -7381,12 +7382,12 @@ then +@@ -7381,12 +7376,12 @@ then LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -54,15 +46,17 @@ $NetBSD: patch-al,v 1.5 2010/09/04 05:12:00 obache Exp $ BSD/OS*/4*) LDSHARED="gcc -shared";; FreeBSD*) if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] -@@ -7410,6 +7411,7 @@ then +@@ -7409,7 +7404,8 @@ then + ;; esac fi;; - NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";; +- NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";; ++ NetBSD*|DragonFly*) LDSHARED='$(CC) -shared ${LDFLAGS}';; + Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then LDSHARED='$(CC) -shared' -@@ -7445,6 +7447,7 @@ then +@@ -7445,6 +7441,7 @@ then Linux*|GNU*) CCSHARED="-fPIC";; BSD/OS*/4*) CCSHARED="-fpic";; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; @@ -70,7 +64,7 @@ $NetBSD: patch-al,v 1.5 2010/09/04 05:12:00 obache Exp $ OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" -@@ -7502,6 +7505,7 @@ then +@@ -7502,6 +7499,7 @@ then then LINKFORSHARED="-Wl,--export-dynamic" fi;; |