Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27387
Modified Files: python27.info python27.patch python33.info python33.patch Log Message: The upstream AIX bug fix causes us to have the wrong value for LDSHARED. This breaks extension building so remove it. Index: python27.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- python27.patch 16 May 2013 01:24:03 -0000 1.10 +++ python27.patch 16 May 2013 11:43:13 -0000 1.11 @@ -47,6 +47,22 @@ # If that also doesn't work return the default values return release,versioninfo,machine +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -303,12 +303,6 @@ + msg = msg + " (%s)" % e.strerror + raise IOError(msg) + +- # On AIX, there are wrong paths to the linker scripts in the Makefile +- # -- these paths are relative to the Python source, but when installed +- # the scripts are in another directory. +- if _PYTHON_BUILD: +- vars['LDSHARED'] = vars['BLDSHARED'] +- + # There's a chicken-and-egg situation on OS X with regards to the + # _sysconfigdata module after the changes introduced by #15298: + # get_config_vars() is called by get_platform() as part of the diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -131,7 +147,7 @@ Darwin*) LDLIBRARY='libpython$(VERSION).dylib' - BLDLIBRARY='-L. -lpython$(VERSION)' -+ BLDLIBRARY="$LDLIBRARY" ++ BLDLIBRARY="`pwd`/$LDLIBRARY" RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' ;; AIX*) Index: python33.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python33.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- python33.info 16 May 2013 01:24:03 -0000 1.7 +++ python33.info 16 May 2013 11:43:13 -0000 1.8 @@ -1,13 +1,14 @@ Info2: << Package: python%type_pkg[python] Version: 3.3.2 -Revision: 1 +Revision: 2 Type: python 3.3 Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Depends: << %N-shlibs (= %v-%r), blt-shlibs, bzip2-shlibs, + fink (>= 0.34.8), gdbm3-shlibs, libgettext8-shlibs, liblzma5-shlibs, @@ -41,7 +42,7 @@ Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 Source2-MD5: b5eee2b290338fb08c1512bfc79bb999 PatchFile: %n.patch -PatchFile-MD5: f2e41052e5c14bf2971d8bff89eeb7bc +PatchFile-MD5: 16b399c098b1af62e808db17b28a7ddb PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 UseMaxBuildJobs: true Index: python27.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.info,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- python27.info 16 May 2013 01:24:03 -0000 1.15 +++ python27.info 16 May 2013 11:43:13 -0000 1.16 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 2.7.5 -Revision: 1 +Revision: 2 Epoch: 1 Type: python 2.7 Maintainer: Daniel Johnson <dan...@daniel-johnson.org> @@ -10,6 +10,7 @@ blt-shlibs, bzip2-shlibs, db53-aes-shlibs, + fink (>= 0.34.8), gdbm3-shlibs, libgettext8-shlibs, libncursesw5-shlibs, @@ -42,7 +43,7 @@ Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 Source2-MD5: 77ae8fd6b456c6339a1a62d57425335b PatchFile: %n.patch -PatchFile-MD5: 79436d1552fe1def194f541253901c09 +PatchFile-MD5: c80fb5c66dfc5af1843e50078b5ccfb0 PatchScript: << sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 << Index: python33.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python33.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- python33.patch 8 Apr 2013 01:37:26 -0000 1.3 +++ python33.patch 16 May 2013 11:43:13 -0000 1.4 @@ -28,6 +28,21 @@ if 'CXX' in os.environ: cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -384,11 +384,6 @@ + if hasattr(e, "strerror"): + msg = msg + " (%s)" % e.strerror + raise IOError(msg) +- # On AIX, there are wrong paths to the linker scripts in the Makefile +- # -- these paths are relative to the Python source, but when installed +- # the scripts are in another directory. +- if _PYTHON_BUILD: +- vars['LDSHARED'] = vars['BLDSHARED'] + + # There's a chicken-and-egg situation on OS X with regards to the + # _sysconfigdata module after the changes introduced by #15298: diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in ------------------------------------------------------------------------------ AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs