[68551] trunk/dports
jmr at macports.org
jmr at macports.org
Sun Jun 6 00:17:55 PDT 2010
Revision: 68551
http://trac.macports.org/changeset/68551
Author: jmr at macports.org
Date: 2010-06-06 00:17:50 -0700 (Sun, 06 Jun 2010)
Log Message:
-----------
add python.add_archflags support to python27 and python31 (#24802)
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/python27-1.0.tcl
trunk/dports/_resources/port1.0/group/python31-1.0.tcl
trunk/dports/lang/python27/Portfile
trunk/dports/lang/python31/Portfile
Modified: trunk/dports/_resources/port1.0/group/python27-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python27-1.0.tcl 2010-06-06 02:47:59 UTC (rev 68550)
+++ trunk/dports/_resources/port1.0/group/python27-1.0.tcl 2010-06-06 07:17:50 UTC (rev 68551)
@@ -46,10 +46,37 @@
depends_lib port:python27
-use_configure no
+# we want the default universal variant added, so use a bad hack for 1.8
+set xcode.project ""
+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}"
+ if {[info exists configure.ld_archflags]} {
+ build.env-append LDFLAGS="${configure.ld_archflags}"
+ } else {
+ build.env-append LDFLAGS="${configure.cc_archflags}"
+ }
+ }
+ }
+}
destroot.cmd ${python.bin} setup.py --no-user-cfg
destroot.destdir --prefix=${python.prefix} --root=${destroot}
Modified: trunk/dports/_resources/port1.0/group/python31-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python31-1.0.tcl 2010-06-06 02:47:59 UTC (rev 68550)
+++ trunk/dports/_resources/port1.0/group/python31-1.0.tcl 2010-06-06 07:17:50 UTC (rev 68551)
@@ -46,10 +46,37 @@
depends_lib port:python31
-use_configure no
+# we want the default universal variant added, so use a bad hack for 1.8
+set xcode.project ""
+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}"
+ if {[info exists configure.ld_archflags]} {
+ build.env-append LDFLAGS="${configure.ld_archflags}"
+ } else {
+ build.env-append LDFLAGS="${configure.cc_archflags}"
+ }
+ }
+ }
+}
destroot.cmd ${python.bin} setup.py --no-user-cfg
destroot.destdir --prefix=${python.prefix} --root=${destroot}
Modified: trunk/dports/lang/python27/Portfile
===================================================================
--- trunk/dports/lang/python27/Portfile 2010-06-06 02:47:59 UTC (rev 68550)
+++ trunk/dports/lang/python27/Portfile 2010-06-06 07:17:50 UTC (rev 68551)
@@ -5,6 +5,7 @@
name python27
version 2.7b1
+revision 1
#set major [lindex [split $version .] 0]
#set branch [join [lrange [split ${version} .] 0 1] .]
set branch 2.7
@@ -121,6 +122,10 @@
foreach unversionedFile {idle pydoc python python-config pythonw smtpd.py} {
delete ${destroot}${prefix}/bin/${unversionedFile}
}
+
+ # remove -arch flags from the config
+ reinplace -E {s|-arch [^[:space:]]+||g} \
+ ${destroot}${framewdir}/lib/python${branch}/config/Makefile
}
platform darwin {
Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile 2010-06-06 02:47:59 UTC (rev 68550)
+++ trunk/dports/lang/python31/Portfile 2010-06-06 07:17:50 UTC (rev 68551)
@@ -6,6 +6,7 @@
name python31
epoch 1
version 3.1.2
+revision 1
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -111,6 +112,10 @@
# http://bugs.python.org/issue4937)
xinstall -m 644 ${filespath}/version.plist \
${destroot}${framewdir}/Resources/version.plist
+
+ # remove -arch flags from the config
+ reinplace -E {s|-arch [^[:space:]]+||g} \
+ ${destroot}${framewdir}/lib/python${branch}/config/Makefile
}
post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100606/de810386/attachment.html>
More information about the macports-changes
mailing list