diff options
author | tron <tron@pkgsrc.org> | 2009-10-21 11:33:32 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2009-10-21 11:33:32 +0000 |
commit | 7d6cefcb4c91e2f52cbd8ed480b451c08f451301 (patch) | |
tree | 3a9858f3fc56289b9dd7af619884ee7e5a2979b2 /lang/python26 | |
parent | 45cb1559d543eb1d1e91bbf18a1bfbc016b2019a (diff) | |
download | pkgsrc-7d6cefcb4c91e2f52cbd8ed480b451c08f451301.tar.gz |
Revert the last commit as the two patches contained non-Mac OS X changes
as well. Problem pointed out by wizd(8).
Diffstat (limited to 'lang/python26')
-rw-r--r-- | lang/python26/distinfo | 4 | ||||
-rw-r--r-- | lang/python26/patches/patch-al | 80 | ||||
-rw-r--r-- | lang/python26/patches/patch-au | 27 |
3 files changed, 110 insertions, 1 deletions
diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 21f8a26ea20..cb75195b218 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2009/10/21 11:05:17 tron Exp $ +$NetBSD: distinfo,v 1.14 2009/10/21 11:33:32 tron Exp $ SHA1 (Python-2.6.3.tar.bz2) = 8e598f7f9299da96899bd8c0afd0d1313221f00f RMD160 (Python-2.6.3.tar.bz2) = 8af600f29c06d0a1bd7e5476750cdd7fac5d7529 @@ -8,9 +8,11 @@ SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026 SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5 SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa +SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e SHA1 (patch-am) = 5a7706aa04b71b24d1400e96f2973699e5c4d147 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072 +SHA1 (patch-au) = cf68c1975f60d18bf37262fa41cbfef1585aeb55 SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156 diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al new file mode 100644 index 00000000000..80b6b310166 --- /dev/null +++ b/lang/python26/patches/patch-al @@ -0,0 +1,80 @@ +$NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $ + +--- configure.orig 2009-03-30 17:56:14.000000000 +0000 ++++ configure +@@ -4108,17 +4108,18 @@ _ACEOF + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +- case $ac_sys_system in +- FreeBSD*) +- SOVERSION=`echo $SOVERSION|cut -d "." -f 1` +- ;; +- 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) +@@ -13064,8 +13065,8 @@ then + LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + else + # No framework, use the Python app as bundle-loader +- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' +- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' ++ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' ++ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + fi ;; + Darwin/*) + # Use -undefined dynamic_lookup whenever possible (10.3 and later). +@@ -13086,12 +13087,12 @@ then + LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + else + # No framework, use the Python app as bundle-loader +- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' +- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' ++ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' ++ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + fi + fi + ;; +- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; + BSD/OS*/4*) LDSHARED="gcc -shared";; + FreeBSD*) + if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] +@@ -13115,6 +13116,7 @@ then + esac + fi;; + 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' +@@ -13150,6 +13152,7 @@ then + Linux*|GNU*) CCSHARED="-fPIC";; + BSD/OS*/4*) CCSHARED="-fpic";; + FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; ++ Interix*) CCSHARED="";; + OpenUNIX*|UnixWare*) + if test "$GCC" = "yes" + then CCSHARED="-fPIC" +@@ -13207,6 +13210,7 @@ then + then + LINKFORSHARED="-Wl,--export-dynamic" + fi;; ++ Interix*) LINKFORSHARED="-Wl,-E";; + SunOS/5*) case $CC in + *gcc*) + if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null diff --git a/lang/python26/patches/patch-au b/lang/python26/patches/patch-au new file mode 100644 index 00000000000..3016f1bc119 --- /dev/null +++ b/lang/python26/patches/patch-au @@ -0,0 +1,27 @@ +$NetBSD: patch-au,v 1.5 2009/10/21 11:33:32 tron Exp $ + +--- Makefile.pre.in.orig 2009-02-24 11:07:44.000000000 +0000 ++++ Makefile.pre.in +@@ -425,6 +425,12 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJ + libpython$(VERSION).sl: $(LIBRARY_OBJS) + $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) + ++libpython$(VERSION).dylib: $(LIBRARY_OBJS) ++ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ \ ++ -current_version 2.6.2 -compatibility_version $(VERSION) \ ++ -o $@ -flat_namespace -undefined suppress $(LDFLAGS) \ ++ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) ++ + # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary + # minimal framework (not including the Lib directory and such) in the current + # directory. +@@ -785,7 +791,8 @@ altbininstall: $(BUILDPYTHON) + (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \ + fi \ + fi; \ +- else true; \ ++ elif test -f $(INSTSONAME); then \ ++ $(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \ + fi + + # Install the manual page |