[78508] trunk/dports

[jmr at macports.org]

Revision: 78508
          http://trac.macports.org/changeset/78508
Author:   jmr at macports.org
Date:     2011-05-10 01:33:40 -0700 (Tue, 10 May 2011)
Log Message:
-----------
python24, python25: handle arch flags like python26+

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/python24-1.0.tcl
    trunk/dports/_resources/port1.0/group/python25-1.0.tcl
    trunk/dports/lang/python24/Portfile
    trunk/dports/lang/python25/Portfile

Modified: trunk/dports/_resources/port1.0/group/python24-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python24-1.0.tcl	2011-05-10 07:58:32 UTC (rev 78507)
+++ trunk/dports/_resources/port1.0/group/python24-1.0.tcl	2011-05-10 08:33:40 UTC (rev 78508)
@@ -50,10 +50,32 @@
 
 depends_lib		port:python24
 
+# we want the default universal variant added despite not using configure
 use_configure	no
+universal_variant yes
 
 build.cmd		${python.bin} setup.py
 build.target	build
+options python.add_archflags
+default python.add_archflags yes
+pre-build {
+    if {${python.add_archflags}} {
+        if {[variant_exists universal] && [variant_isset universal]} {
+            build.env-append CFLAGS="${configure.universal_cflags}" \
+                             OBJCFLAGS="${configure.universal_cflags}" \
+                             CXXFLAGS="${configure.universal_cxxflags}" \
+                             LDFLAGS="${configure.universal_ldflags}"
+        } else {
+            build.env-append CFLAGS="${configure.cc_archflags}" \
+                             OBJCFLAGS="${configure.objc_archflags}" \
+                             CXXFLAGS="${configure.cxx_archflags}" \
+                             FFLAGS="${configure.f77_archflags}" \
+                             F90FLAGS="${configure.f90_archflags}" \
+                             FCFLAGS="${configure.fc_archflags}" \
+                             LDFLAGS="${configure.ld_archflags}"
+        }
+    }
+}
 
 destroot.cmd	${python.bin} setup.py
 destroot.destdir	--prefix=${prefix} --root=${destroot}

Modified: trunk/dports/_resources/port1.0/group/python25-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python25-1.0.tcl	2011-05-10 07:58:32 UTC (rev 78507)
+++ trunk/dports/_resources/port1.0/group/python25-1.0.tcl	2011-05-10 08:33:40 UTC (rev 78508)
@@ -45,10 +45,32 @@
 
 depends_lib		port:python25
 
+# we want the default universal variant added despite not using configure
 use_configure	no
+universal_variant yes
 
 build.cmd		${python.bin} setup.py --no-user-cfg
 build.target	build
+options python.add_archflags
+default python.add_archflags yes
+pre-build {
+    if {${python.add_archflags}} {
+        if {[variant_exists universal] && [variant_isset universal]} {
+            build.env-append CFLAGS="${configure.universal_cflags}" \
+                             OBJCFLAGS="${configure.universal_cflags}" \
+                             CXXFLAGS="${configure.universal_cxxflags}" \
+                             LDFLAGS="${configure.universal_ldflags}"
+        } else {
+            build.env-append CFLAGS="${configure.cc_archflags}" \
+                             OBJCFLAGS="${configure.objc_archflags}" \
+                             CXXFLAGS="${configure.cxx_archflags}" \
+                             FFLAGS="${configure.f77_archflags}" \
+                             F90FLAGS="${configure.f90_archflags}" \
+                             FCFLAGS="${configure.fc_archflags}" \
+                             LDFLAGS="${configure.ld_archflags}"
+        }
+    }
+}
 
 destroot.cmd	${python.bin} setup.py --no-user-cfg
 destroot.destdir	--prefix=${prefix} --root=${destroot}

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2011-05-10 07:58:32 UTC (rev 78507)
+++ trunk/dports/lang/python24/Portfile	2011-05-10 08:33:40 UTC (rev 78508)
@@ -5,7 +5,7 @@
 
 name                    python24
 version                 2.4.6
-revision                7
+revision                8
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -170,6 +170,11 @@
             reinplace s/-lSystemStubs//g ${worksrcpath}/configure
         }
     }
+    post-destroot {
+        # remove -arch flags from the config
+        reinplace -E {s|-arch [a-z0-9_]+||g} \
+            ${destroot}${prefix}/lib/python${branch}/config/Makefile
+    }
 }
 
 platform puredarwin {

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2011-05-10 07:58:32 UTC (rev 78507)
+++ trunk/dports/lang/python25/Portfile	2011-05-10 08:33:40 UTC (rev 78508)
@@ -5,7 +5,7 @@
 
 name                    python25
 version                 2.5.5
-revision                2
+revision                3
 
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -154,6 +154,11 @@
 			reinplace s/-lSystemStubs//g ${worksrcpath}/configure
 		}
    }
+   post-destroot {
+      # remove -arch flags from the config
+      reinplace -E {s|-arch [a-z0-9_]+||g} \
+         ${destroot}${prefix}/lib/python${branch}/config/Makefile
+   }
 }
 
 platform darwin 8 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110510/6eb70983/attachment-0001.html>