[69859] trunk/dports/lang
jmr at macports.org
jmr at macports.org
Sun Jul 18 20:31:11 PDT 2010
Revision: 69859
http://trac.macports.org/changeset/69859
Author: jmr at macports.org
Date: 2010-07-18 20:31:10 -0700 (Sun, 18 Jul 2010)
Log Message:
-----------
gcc44, gcc45, gcc46: enable multilib via universal variant (#22116)
Modified Paths:
--------------
trunk/dports/lang/gcc44/Portfile
trunk/dports/lang/gcc45/Portfile
trunk/dports/lang/gcc46/Portfile
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2010-07-19 03:24:33 UTC (rev 69858)
+++ trunk/dports/lang/gcc44/Portfile 2010-07-19 03:31:10 UTC (rev 69859)
@@ -51,9 +51,6 @@
use_bzip2 yes
-# gmp and mpfr are not universal
-universal_variant no
-
depends_lib port:gmp port:mpfr port:libiconv
patch.dir ${workpath}/gcc-${version}
@@ -63,13 +60,11 @@
worksrcdir build
# the generated compiler doesn't accept -arch
-if {${os.platform} == "darwin"} {
- configure.cc_archflags
- configure.cxx_archflags
- configure.objc_archflags
- if {[info exists configure.ld_archflags]} {
- configure.ld_archflags
- }
+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}
}
@@ -90,7 +85,8 @@
--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
- --enable-stage1-checking
+ --enable-stage1-checking \
+ --disable-multilib
# do NOT use MacPorts binutils -- they do not work
configure.env-append AR_FOR_TARGET=/usr/bin/ar \
AS_FOR_TARGET=/usr/bin/as \
@@ -121,10 +117,6 @@
${destroot}${prefix}/share/python/classfile-44.py
}
-platform powerpc {
- configure.args-append --disable-multilib
-}
-
platform darwin 10 {
configure.args-append --enable-fully-dynamic-string
}
@@ -142,7 +134,20 @@
--with-ar=${prefix}/bin/odar
}
+platform powerpc {
+ configure.universal_archs ppc ppc64
+}
+platform i386 {
+ configure.universal_archs i386 x86_64
+}
+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/
livecheck.regex GCC (4\\.4\\.\[0-9\])
-
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2010-07-19 03:24:33 UTC (rev 69858)
+++ trunk/dports/lang/gcc45/Portfile 2010-07-19 03:31:10 UTC (rev 69859)
@@ -61,9 +61,6 @@
use_bzip2 yes
-# gmp and mpfr are not universal
-universal_variant no
-
depends_lib port:gmp port:mpfr port:libiconv port:libmpc
patchfiles tls_configure_fix.diff
@@ -74,10 +71,11 @@
worksrcdir build
# the generated compiler doesn't accept -arch
-if {[info exists build_arch] && ${os.platform} == "darwin"} {
- configure.cc_archflags
- configure.cxx_archflags
- configure.objc_archflags
+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}
}
@@ -104,7 +102,8 @@
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
--with-mpc=${prefix} \
- --enable-stage1-checking
+ --enable-stage1-checking \
+ --disable-multilib
# do NOT use MacPorts binutils -- they do not work
configure.env-append AR_FOR_TARGET=/usr/bin/ar \
AS_FOR_TARGET=/usr/bin/as \
@@ -135,15 +134,24 @@
${destroot}${prefix}/share/python/classfile-45.py
}
-platform powerpc {
- configure.args-append --disable-multilib
-}
-
platform darwin 10 {
configure.args-append --enable-fully-dynamic-string
}
+platform powerpc {
+ configure.universal_archs ppc ppc64
+}
+platform i386 {
+ configure.universal_archs i386 x86_64
+}
+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/
livecheck.regex GCC (4\\.5\\.\[0-9\])
-
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2010-07-19 03:24:33 UTC (rev 69858)
+++ trunk/dports/lang/gcc46/Portfile 2010-07-19 03:31:10 UTC (rev 69859)
@@ -59,9 +59,6 @@
use_bzip2 yes
-# gmp and mpfr are not universal
-universal_variant no
-
depends_lib port:gmp port:mpfr port:libiconv port:libmpc
patchfiles patch-160729.diff
@@ -73,10 +70,11 @@
worksrcdir build
# the generated compiler doesn't accept -arch
-if {[info exists build_arch] && ${os.platform} == "darwin"} {
- configure.cc_archflags
- configure.cxx_archflags
- configure.objc_archflags
+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}
}
@@ -103,7 +101,8 @@
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
--with-mpc=${prefix} \
- --enable-stage1-checking
+ --enable-stage1-checking \
+ --disable-multilib
# do NOT use MacPorts binutils -- they do not work
configure.env-append AR_FOR_TARGET=/usr/bin/ar \
AS_FOR_TARGET=/usr/bin/as \
@@ -130,10 +129,6 @@
xinstall -m 444 ${filespath}/mp-gcc46 ${destroot}${prefix}/etc/select/gcc/
}
-platform powerpc {
- configure.args-append --disable-multilib
-}
-
platform darwin 10 {
configure.args-append --enable-fully-dynamic-string
}
@@ -158,7 +153,20 @@
}
}
+platform powerpc {
+ configure.universal_archs ppc ppc64
+}
+platform i386 {
+ configure.universal_archs i386 x86_64
+}
+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/
livecheck.regex LATEST-4.6 -> (4.6-\[0-9\]+)
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100718/e09fea32/attachment-0001.html>
More information about the macports-changes
mailing list