[89472] trunk/dports/lang

31 Jan 2012

Revision: 89472
          http://trac.macports.org/changeset/89472
Author:   jmr@macports.org
Date:     2012-01-30 18:45:07 -0800 (Mon, 30 Jan 2012)
Log Message:
-----------
gcc ports: append arch flags to configure.cc (#28376)

Modified Paths:
--------------
    trunk/dports/lang/gcc42/Portfile
    trunk/dports/lang/gcc43/Portfile
    trunk/dports/lang/gcc44/Portfile
    trunk/dports/lang/gcc45/Portfile
    trunk/dports/lang/gcc46/Portfile
    trunk/dports/lang/gcc47/Portfile

Modified: trunk/dports/lang/gcc42/Portfile
===================================================================

--- trunk/dports/lang/gcc42/Portfile	2012-01-31 02:23:21 UTC (rev 89471)
+++ trunk/dports/lang/gcc42/Portfile	2012-01-31 02:45:07 UTC (rev 89472)
@@ -55,6 +55,7 @@
 }
 
 # the generated compiler doesn't accept -arch
+configure.cc-append [get_canonical_archflags]
 configure.cc_archflags
 configure.cxx_archflags
 configure.objc_archflags

Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile	2012-01-31 02:23:21 UTC (rev 89471)
+++ trunk/dports/lang/gcc43/Portfile	2012-01-31 02:45:07 UTC (rev 89472)
@@ -67,11 +67,6 @@
     file mkdir ${worksrcpath}
 }
 
-# the generated compiler doesn't accept -arch
-configure.cc_archflags
-configure.cxx_archflags
-configure.objc_archflags
-configure.ld_archflags
 platform darwin {
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
@@ -167,13 +162,19 @@
 platform i386 {
     configure.universal_archs i386 x86_64
 }
+variant universal {
+    configure.args-delete --disable-multilib
+}
+# the generated compiler doesn't accept -arch
+configure.cc-append [get_canonical_archflags]
+configure.cc_archflags
+configure.cxx_archflags
+configure.objc_archflags
+configure.ld_archflags
 configure.universal_cflags
 configure.universal_cxxflags
 configure.universal_ldflags
 configure.universal_args
-variant universal {
-    configure.args-delete --disable-multilib
-}
 
 livecheck.type  regex
 livecheck.url   http://gcc.gnu.org/gcc-4.3/

Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile	2012-01-31 02:23:21 UTC (rev 89471)
+++ trunk/dports/lang/gcc44/Portfile	2012-01-31 02:45:07 UTC (rev 89472)
@@ -61,11 +61,6 @@
 
 worksrcdir		build
 
-# the generated compiler doesn't accept -arch
-configure.cc_archflags
-configure.cxx_archflags
-configure.objc_archflags
-configure.ld_archflags
 platform darwin {
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
@@ -160,13 +155,19 @@
 platform i386 {
     configure.universal_archs i386 x86_64
 }
+variant universal {
+    configure.args-delete --disable-multilib
+}
+# the generated compiler doesn't accept -arch
+configure.cc-append [get_canonical_archflags]
+configure.cc_archflags
+configure.cxx_archflags
+configure.objc_archflags
+configure.ld_archflags
 configure.universal_cflags
 configure.universal_cxxflags
 configure.universal_ldflags
 configure.universal_args
-variant universal {
-    configure.args-delete --disable-multilib
-}
 
 livecheck.type	regex
 livecheck.url	http://gcc.gnu.org/gcc-4.4/

Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile	2012-01-31 02:23:21 UTC (rev 89471)
+++ trunk/dports/lang/gcc45/Portfile	2012-01-31 02:45:07 UTC (rev 89472)
@@ -70,11 +70,6 @@
 
 worksrcdir		build
 
-# the generated compiler doesn't accept -arch
-configure.cc_archflags
-configure.cxx_archflags
-configure.objc_archflags
-configure.ld_archflags
 platform darwin {
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
@@ -158,13 +153,19 @@
 platform i386 {
     configure.universal_archs i386 x86_64
 }
+variant universal {
+    configure.args-delete --disable-multilib
+}
+# the generated compiler doesn't accept -arch
+configure.cc-append [get_canonical_archflags]
+configure.cc_archflags
+configure.cxx_archflags
+configure.objc_archflags
+configure.ld_archflags
 configure.universal_cflags
 configure.universal_cxxflags
 configure.universal_ldflags
 configure.universal_args
-variant universal {
-    configure.args-delete --disable-multilib
-}
 
 livecheck.type  regex
 livecheck.url   http://gcc.gnu.org/gcc-4.5/

Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile	2012-01-31 02:23:21 UTC (rev 89471)
+++ trunk/dports/lang/gcc46/Portfile	2012-01-31 02:45:07 UTC (rev 89472)
@@ -29,7 +29,7 @@
 
 set ecj			ecj-4.5.jar
 set gcc			gcc-${version}.tar.bz2
-distfiles		${gcc}:gcc ${ecj}:ejc
+distfiles		${gcc}:gcc ${ecj}:ecj
 extract.only		${gcc}
 
 checksums           gcc-4.6.2.tar.bz2 \
@@ -54,11 +54,6 @@
 	copy ${distpath}/${ecj} ${workpath}/gcc-${version}/ecj.jar
 }
 
-# the generated compiler doesn't accept -arch
-configure.cc_archflags
-configure.cxx_archflags
-configure.objc_archflags
-configure.ld_archflags
 platform darwin {
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
@@ -128,13 +123,19 @@
 platform i386 {
     configure.universal_archs i386 x86_64
 }
+variant universal {
+    configure.args-delete --disable-multilib
+}
+# the generated compiler doesn't accept -arch
+configure.cc-append [get_canonical_archflags]
+configure.cc_archflags
+configure.cxx_archflags
+configure.objc_archflags
+configure.ld_archflags
 configure.universal_cflags
 configure.universal_cxxflags
 configure.universal_ldflags
 configure.universal_args
-variant universal {
-    configure.args-delete --disable-multilib
-}
 
 variant cloog description {enable the CLOOG Graphite loop optimizations} {
     configure.args-append   --with-cloog=${prefix} --enable-cloog-backend=isl

Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile	2012-01-31 02:23:21 UTC (rev 89471)
+++ trunk/dports/lang/gcc47/Portfile	2012-01-31 02:45:07 UTC (rev 89472)
@@ -41,11 +41,6 @@
     file mkdir ${worksrcpath}
 }
 
-# the generated compiler doesn't accept -arch
-configure.cc_archflags
-configure.cxx_archflags
-configure.objc_archflags
-configure.ld_archflags
 platform darwin {
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
@@ -126,13 +121,19 @@
 platform i386 {
     configure.universal_archs i386 x86_64
 }
+variant universal {
+    configure.args-delete --disable-multilib
+}
+# the generated compiler doesn't accept -arch
+configure.cc-append [get_canonical_archflags]
+configure.cc_archflags
+configure.cxx_archflags
+configure.objc_archflags
+configure.ld_archflags
 configure.universal_cflags
 configure.universal_cxxflags
 configure.universal_ldflags
 configure.universal_args
-variant universal {
-    configure.args-delete --disable-multilib
-}
 
 livecheck.type      regex
 livecheck.url       ftp://gcc.gnu.org/pub/gcc/snapshots/

    

jmr＠macports.org

tags

participants (1)