[71610] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Fri Sep 17 19:04:19 PDT 2010
Revision: 71610
http://trac.macports.org/changeset/71610
Author: ryandesign at macports.org
Date: 2010-09-17 19:04:15 -0700 (Fri, 17 Sep 2010)
Log Message:
-----------
Use supported_archs to force a 32-bit build instead of manually manipulating build_arch; see #26503
Modified Paths:
--------------
trunk/dports/aqua/CosmicDebris/Portfile
trunk/dports/aqua/TeXShop/Portfile
trunk/dports/aqua/fltk/Portfile
trunk/dports/aqua/pgAdmin3/Portfile
trunk/dports/devel/allegro/Portfile
trunk/dports/devel/xulrunner/Portfile
trunk/dports/devel/xulrunner-devel/Portfile
trunk/dports/emulators/dosbox/Portfile
trunk/dports/games/liquidwar/Portfile
trunk/dports/graphics/wxWidgets/Portfile
trunk/dports/graphics/wxWidgets-python/Portfile
trunk/dports/lang/scsh/Portfile
trunk/dports/science/playerstage-stage/Portfile
trunk/dports/sysutils/osxutils/Portfile
trunk/dports/sysutils/synergy/Portfile
trunk/dports/www/firefox-x11/Portfile
trunk/dports/www/firefox-x11-devel/Portfile
Modified: trunk/dports/aqua/CosmicDebris/Portfile
===================================================================
--- trunk/dports/aqua/CosmicDebris/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/aqua/CosmicDebris/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -26,11 +26,7 @@
use_zip yes
# current version uses NSMailDelivery which is not available in 64-bit
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
if {[variant_isset universal] && [string match *64* $universal_archs]} {
pre-fetch {
return -code error "$name $version cannot be built for 64-bit architectures"
Modified: trunk/dports/aqua/TeXShop/Portfile
===================================================================
--- trunk/dports/aqua/TeXShop/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/aqua/TeXShop/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -27,11 +27,7 @@
rmd160 e353a5c3213c2a8727a26f3f4664452db91907e0
# force 32-bit, ticket #20291
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
post-extract {
reinplace "s/defaultConfigurationName = Debug/defaultConfigurationName = Release/" ${worksrcpath}/${name}.xcodeproj/project.pbxproj
Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/aqua/fltk/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -49,13 +49,8 @@
--mandir=${prefix}/share/man
# Force 32-bit (#21054)
-if {${build_arch} == "x86_64"} {
- configure.build_arch i386
- configure.args-append --with-archflags="-arch i386"
-} elseif {${build_arch} == "ppc64"} {
- configure.build_arch ppc
- configure.args-append --with-archflags="-arch ppc"
-}
+supported_archs i386 ppc
+configure.args-append --with-archflags="-arch ${configure.build_arch}"
use_parallel_build yes
Modified: trunk/dports/aqua/pgAdmin3/Portfile
===================================================================
--- trunk/dports/aqua/pgAdmin3/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/aqua/pgAdmin3/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -47,14 +47,8 @@
use_parallel_build no
build.target all install
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
-if {![info exists configure.ld_archflags]} {
- eval configure.ldflags-append ${configure.cc_archflags}
-}
+supported_archs i386 ppc
+
# wxWidgets is not universal
universal_variant no
Modified: trunk/dports/devel/allegro/Portfile
===================================================================
--- trunk/dports/devel/allegro/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/devel/allegro/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -30,11 +30,9 @@
}
}
-platform darwin 10 {
- # Does not compile 64-bit due to NSQuickDraw
- # and probably other old API usage
- configure.build_arch i386
-}
+# Does not compile 64-bit due to NSQuickDraw
+# and probably other old API usage
+supported_archs i386 ppc
livecheck.type regex
livecheck.url http://alleg.sourceforge.net/wip.html
Modified: trunk/dports/devel/xulrunner/Portfile
===================================================================
--- trunk/dports/devel/xulrunner/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/devel/xulrunner/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -122,11 +122,7 @@
# xpctools and necko-wifi broke in 3.6b1
# Force 32-bit, inline-asm
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
Modified: trunk/dports/devel/xulrunner-devel/Portfile
===================================================================
--- trunk/dports/devel/xulrunner-devel/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/devel/xulrunner-devel/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -122,11 +122,7 @@
# xpctools and necko-wifi broke in 3.6b1
# Force 32-bit, inline-asm
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
Modified: trunk/dports/emulators/dosbox/Portfile
===================================================================
--- trunk/dports/emulators/dosbox/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/emulators/dosbox/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -54,11 +54,7 @@
${destroot}${prefix}/share/doc/${name}
}
-if {${build_arch} == "x86_64"} {
- configure.build_arch i386
-} elseif {${build_arch} == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
platform darwin {
configure.args-append --build=${configure.build_arch}-apple-darwin${os.major}
Modified: trunk/dports/games/liquidwar/Portfile
===================================================================
--- trunk/dports/games/liquidwar/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/games/liquidwar/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -33,12 +33,8 @@
reinplace -E "s|^DATADIR =(.*)$|DATADIR = \$(datadir)/liquidwar|" ${worksrcpath}/src/Makefile.in
}
-if {$build_arch == "x86_64"} {
- # Allegro does not compile 64-bit due to NS* stuff, so we have to do i386
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
+# Allegro does not compile 64-bit due to NS* stuff, so we have to do 32-bit
+supported_archs i386 ppc
configure.cflags-append -DALLEGRO_UNIX
configure.args-append --disable-target-opt --disable-asm
Modified: trunk/dports/graphics/wxWidgets/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/graphics/wxWidgets/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -81,15 +81,8 @@
universal_variant no
use_parallel_build no
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
- configure.cppflags-append -arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
-if {![info exists configure.ld_archflags]} {
- eval configure.ldflags-append ${configure.cc_archflags}
-}
+supported_archs i386 ppc
+configure.cppflags-append -arch ${configure.build_arch}
post-build {
foreach c { ${contrib} } {
Modified: trunk/dports/graphics/wxWidgets-python/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-python/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/graphics/wxWidgets-python/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -83,20 +83,13 @@
use_parallel_build no
variant carbon conflicts gtk description {use carbon} {
+ supported_archs i386 ppc
configure.args-append --with-mac
- if {$build_arch == "x86_64"} {
- configure.build_arch i386
- configure.cflags-append -arch i386
- configure.ldflags-append -arch i386
- configure.cxxflags-append -arch i386
- configure.cppflags-append -arch i386
- configure.objcflags-append -arch i386
- } elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
- }
- if {![info exists configure.ld_archflags]} {
- eval configure.ldflags-append ${configure.cc_archflags}
- }
+ configure.cflags-append -arch ${configure.build_arch}
+ configure.ldflags-append -arch ${configure.build_arch}
+ configure.cxxflags-append -arch ${configure.build_arch}
+ configure.cppflags-append -arch ${configure.build_arch}
+ configure.objcflags-append -arch ${configure.build_arch}
}
variant gtk conflicts carbon description {use gtk} {
depends_lib-append port:gtk2
Modified: trunk/dports/lang/scsh/Portfile
===================================================================
--- trunk/dports/lang/scsh/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/lang/scsh/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -23,11 +23,4 @@
build.target enough
# Force 32-bit build
-switch ${build_arch} {
- x86_64 {
- configure.build_arch i386
- }
- ppc64 {
- configure.build_arch ppc
- }
-}
+supported_archs i386 ppc
Modified: trunk/dports/science/playerstage-stage/Portfile
===================================================================
--- trunk/dports/science/playerstage-stage/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/science/playerstage-stage/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -43,11 +43,7 @@
# fltk is 32-bit only.
universal_variant no
-if {${build_arch} == "x86_64"} {
- configure.build_arch i386
-} elseif {${build_arch} == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
post-build {
reinplace "s|${configure.cc_archflags}||g" ${worksrcpath}/stage.pc
Modified: trunk/dports/sysutils/osxutils/Portfile
===================================================================
--- trunk/dports/sysutils/osxutils/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/sysutils/osxutils/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -37,11 +37,7 @@
}
# all but one of these tools use 32-bit-only carbon bits
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
set bt {getfcomment geticon hfsdata lsmac mkalias setfcomment setfctypes setfflags seticon setlabel setsuffix wsupdate}
Modified: trunk/dports/sysutils/synergy/Portfile
===================================================================
--- trunk/dports/sysutils/synergy/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/sysutils/synergy/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -43,8 +43,4 @@
livecheck.regex <title>Sources (.*) released.*</title>
# Force 32-bit, all kinds of Carbon cruft in here. (#20908)
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
+supported_archs i386 ppc
Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/www/firefox-x11/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -112,28 +112,12 @@
# xpctools and necko-wifi broke in 3.6b1
# Force 32-bit, inline-asm
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
+supported_archs i386 ppc
+# Yes, this is ugly... but the real fix is in the works
+# https://bugzilla.mozilla.org/show_bug.cgi?id=529878
+configure.cc ${configure.cc} -arch ${configure.build_arch}
+configure.cxx ${configure.cxx} -arch ${configure.build_arch}
- # Yes, this is ugly... but the real fix is in the works
- # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
- configure.cc ${configure.cc} -arch i386
- configure.cxx ${configure.cxx} -arch i386
-
- # Take this out when we ship >1.8.1
- configure.ldflags-append -arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-
- # Yes, this is ugly... but the real fix is in the works
- # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
- configure.cc ${configure.cc} -arch ppc
- configure.cxx ${configure.cxx} -arch ppc
-
- # Take this out when we ship >1.8.1
- configure.ldflags-append -arch ppc
-}
-
variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
--disable-mochitest \
Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile 2010-09-18 00:52:16 UTC (rev 71609)
+++ trunk/dports/www/firefox-x11-devel/Portfile 2010-09-18 02:04:15 UTC (rev 71610)
@@ -112,28 +112,12 @@
# xpctools and necko-wifi broke in 3.6b1
# Force 32-bit, inline-asm
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
+supported_archs i386 ppc
+# Yes, this is ugly... but the real fix is in the works
+# https://bugzilla.mozilla.org/show_bug.cgi?id=529878
+configure.cc ${configure.cc} -arch ${configure.build_arch}
+configure.cxx ${configure.cxx} -arch ${configure.build_arch}
- # Yes, this is ugly... but the real fix is in the works
- # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
- configure.cc ${configure.cc} -arch i386
- configure.cxx ${configure.cxx} -arch i386
-
- # Take this out when we ship >1.8.1
- configure.ldflags-append -arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-
- # Yes, this is ugly... but the real fix is in the works
- # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
- configure.cc ${configure.cc} -arch ppc
- configure.cxx ${configure.cxx} -arch ppc
-
- # Take this out when we ship >1.8.1
- configure.ldflags-append -arch ppc
-}
-
variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
--disable-mochitest \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100917/c3bf6c69/attachment.html>
More information about the macports-changes
mailing list