Revision
108762
Author
jmr@macports.org
Date
2013-08-01 00:58:09 -0700 (Thu, 01 Aug 2013)

Log Message

python27:
 * remove -arch flags from _sysconfigdata.py (#39669)
 * remove non-working attempt to change LINKFORSHARED. Any dependents relying on this are broken anyway and should be fixed to get the required info from python2.7-config (#39223)
 * add comment about adjustments that will be required in 2.7.6

Modified Paths

Diff

Modified: trunk/dports/lang/python27/Portfile (108761 => 108762)


--- trunk/dports/lang/python27/Portfile	2013-08-01 07:23:06 UTC (rev 108761)
+++ trunk/dports/lang/python27/Portfile	2013-08-01 07:58:09 UTC (rev 108762)
@@ -8,6 +8,7 @@
 epoch               2
 # Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
 version             2.7.5
+revision            1
 
 set major           [lindex [split $version .] 0]
 set branch          [join [lrange [split ${version} .] 0 1] .]
@@ -105,22 +106,14 @@
     ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
     ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
 
-    # Without this, LINKFORSHARED is set to
-    # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
-    # (this becomes Python.framework/Versions/2.7/Python) which doesn't
-    # quite work (see ticket #15099); instead specifically list the
-    # full path to the proper Python framework file (which becomes
-    # ${prefix}/Library/Frameworks/Python.framework/Versions/2.7/Python)
-    reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} \
-        ${destroot}${framewdir}/lib/python${branch}/config/Makefile
-
     foreach unversionedFile {2to3 2to3-2 idle idle2 pydoc pydoc2 python python2 python-config python2-config pythonw pythonw2 smtpd.py smtpd2.py} {
         delete ${destroot}${prefix}/bin/${unversionedFile}
     }
 
     # remove -arch flags from the config
     reinplace -E {s|-arch [a-z0-9_]+||g} \
-        ${destroot}${framewdir}/lib/python${branch}/config/Makefile
+        ${destroot}${framewdir}/lib/python${branch}/config/Makefile \
+        ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata.py
 }
 
 platform darwin {
@@ -132,6 +125,8 @@
 }
 
 variant universal {
+    # This patch will need updating when 2.7.6 is released, as ARCH_RUN_32BIT
+    # will once again be used for something. See ticket #39270.
     patchfiles-append patch-configure-universal.diff
     post-patch {
         reinplace \