[92064] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Mon Apr 16 20:12:51 PDT 2012
Revision: 92064
https://trac.macports.org/changeset/92064
Author: jeremyhu at macports.org
Date: 2012-04-16 20:12:49 -0700 (Mon, 16 Apr 2012)
Log Message:
-----------
gcc*: Use our cctools and ld64 for assembly and linking
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
trunk/dports/lang/gcc48/Portfile
Modified: trunk/dports/lang/gcc42/Portfile
===================================================================
--- trunk/dports/lang/gcc42/Portfile 2012-04-17 02:35:28 UTC (rev 92063)
+++ trunk/dports/lang/gcc42/Portfile 2012-04-17 03:12:49 UTC (rev 92064)
@@ -5,7 +5,7 @@
name gcc42
version 4.2.4
-revision 2
+revision 3
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -41,8 +41,10 @@
universal_variant no
depends_lib port:gmp port:mpfr port:libiconv
-depends_run port:gcc_select
+depends_run port:gcc_select port:ld64 port:cctools
+depends_skip_archcheck-append gcc_select ld64 cctools
+
set major 4.2
worksrcdir build
@@ -92,16 +94,20 @@
--program-suffix=-mp-${major} \
--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gmp=${prefix} \
- --with-mpfr=${prefix}
-# do NOT use MacPorts binutils -- they do not work
-configure.env-append AR_FOR_TARGET=/usr/bin/ar \
- AS_FOR_TARGET=/usr/bin/as \
- LD_FOR_TARGET=/usr/bin/ld \
- NM_FOR_TARGET=/usr/bin/nm \
- OBJDUMP_FOR_TARGET=/usr/bin/objdump \
- RANLIB_FOR_TARGET=/usr/bin/ranlib \
- STRIP_FOR_TARGET=/usr/bin/strip
+ --with-mpfr=${prefix} \
+ --with-as=${prefix}/bin/as \
+ --with-ld=${prefix}/bin/ld \
+ --with-ar=${prefix}/bin/ar
+
+configure.env-append AR_FOR_TARGET=${prefix}/bin/ar \
+ AS_FOR_TARGET=${prefix}/bin/as \
+ LD_FOR_TARGET=${prefix}/bin/ld \
+ NM_FOR_TARGET=${prefix}/bin/nm \
+ OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+ RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+ STRIP_FOR_TARGET=${prefix}/bin/strip
+
use_parallel_build yes
destroot.target install install-info-host
@@ -121,18 +127,6 @@
select.group gcc
select.file ${filespath}/mp-${name}
-# odcctools currently do not compile for x64 - move to variant for the time being
-variant odcctools {
- depends_lib-append bin:odas:odcctools
- patch {
- reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
- ${workpath}/gcc-${version}/gcc/config/darwin.h
- }
- configure.args-append --with-as=${prefix}/bin/odas \
- --with-ld=${prefix}/bin/odld \
- --with-ar=${prefix}/bin/odar
-}
-
livecheck.type regex
livecheck.url http://gcc.gnu.org/gcc-4.2/
livecheck.regex GCC (4\\.2\\.\[0-9\])
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2012-04-17 02:35:28 UTC (rev 92063)
+++ trunk/dports/lang/gcc43/Portfile 2012-04-17 03:12:49 UTC (rev 92064)
@@ -6,7 +6,7 @@
name gcc43
version 4.3.6
-revision 1
+revision 2
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -54,8 +54,10 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv
-depends_run port:gcc_select
+depends_run port:gcc_select port:ld64 port:cctools
+depends_skip_archcheck-append gcc_select ld64 cctools
+
patchfiles Make-lang.in.diff darwin10.diff i386_multilib.diff
patch.dir ${workpath}/gcc-${version}
@@ -85,16 +87,20 @@
--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
- --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 \
- LD_FOR_TARGET=/usr/bin/ld \
- NM_FOR_TARGET=/usr/bin/nm \
- OBJDUMP_FOR_TARGET=/usr/bin/objdump \
- RANLIB_FOR_TARGET=/usr/bin/ranlib \
- STRIP_FOR_TARGET=/usr/bin/strip
+ --disable-multilib \
+ --with-as=${prefix}/bin/as \
+ --with-ld=${prefix}/bin/ld \
+ --with-ar=${prefix}/bin/ar
+configure.env-append \
+ AR_FOR_TARGET=${prefix}/bin/ar \
+ AS_FOR_TARGET=${prefix}/bin/as \
+ LD_FOR_TARGET=${prefix}/bin/ld \
+ NM_FOR_TARGET=${prefix}/bin/nm \
+ OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+ RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+ STRIP_FOR_TARGET=${prefix}/bin/strip
+
# http://trac.macports.org/ticket/29104
if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler clang
@@ -150,19 +156,6 @@
configure.args-append --enable-languages=c,c++,objc,obj-c++,fortran
}
-# odcctools currently do not compile for x64 - move to variant for the time being
-#variant odcctools \
-# description "Use the odcctools instead of the system provided ones - does not work for x64 currently!" {
-# depends_lib-append port:odcctools
-# patch {
-# reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
-# ${workpath}/gcc-${version}/gcc/config/darwin.h
-# }
-# configure.args-append --with-as=${prefix}/bin/odas \
-# --with-ld=${prefix}/bin/odld \
-# --with-ar=${prefix}/bin/odar
-#}
-
platform powerpc {
configure.universal_archs ppc ppc64
}
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2012-04-17 02:35:28 UTC (rev 92063)
+++ trunk/dports/lang/gcc44/Portfile 2012-04-17 03:12:49 UTC (rev 92064)
@@ -6,6 +6,7 @@
name gcc44
epoch 1
version 4.4.7
+revision 1
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -53,8 +54,10 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv
-depends_run port:gcc_select
+depends_run port:gcc_select port:ld64 port:cctools
+depends_skip_archcheck-append gcc_select ld64 cctools
+
patch.dir ${workpath}/gcc-${version}
set major 4.4
@@ -83,16 +86,20 @@
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
--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 \
- LD_FOR_TARGET=/usr/bin/ld \
- NM_FOR_TARGET=/usr/bin/nm \
- OBJDUMP_FOR_TARGET=/usr/bin/objdump \
- RANLIB_FOR_TARGET=/usr/bin/ranlib \
- STRIP_FOR_TARGET=/usr/bin/strip
+ --disable-multilib \
+ --with-as=${prefix}/bin/as \
+ --with-ld=${prefix}/bin/ld \
+ --with-ar=${prefix}/bin/ar
+configure.env-append \
+ AR_FOR_TARGET=${prefix}/bin/ar \
+ AS_FOR_TARGET=${prefix}/bin/as \
+ LD_FOR_TARGET=${prefix}/bin/ld \
+ NM_FOR_TARGET=${prefix}/bin/nm \
+ OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+ RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+ STRIP_FOR_TARGET=${prefix}/bin/strip
+
build.target bootstrap
use_parallel_build yes
@@ -136,19 +143,6 @@
configure.args-append --enable-fully-dynamic-string
}
-# odcctools currently do not compile for x64 - move to variant for the time being
-variant odcctools \
- description "Use the odcctools instead of the system provided ones - does not work for x64 currently!" {
- depends_lib-append port:odcctools
- post-patch {
- reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
- ${workpath}/gcc-${version}/gcc/config/darwin.h
- }
- configure.args-append --with-as=${prefix}/bin/odas \
- --with-ld=${prefix}/bin/odld \
- --with-ar=${prefix}/bin/odar
-}
-
platform powerpc {
configure.universal_archs ppc ppc64
}
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2012-04-17 02:35:28 UTC (rev 92063)
+++ trunk/dports/lang/gcc45/Portfile 2012-04-17 03:12:49 UTC (rev 92064)
@@ -6,7 +6,7 @@
name gcc45
epoch 1
version 4.5.3
-revision 2
+revision 3
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -63,9 +63,11 @@
use_bzip2 yes
-depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl
-depends_run port:gcc_select
+depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl
+depends_run port:gcc_select port:ld64 port:cctools
+depends_skip_archcheck-append gcc_select ld64 cctools
+
set major 4.5
worksrcdir build
@@ -99,16 +101,20 @@
--with-mpc=${prefix} \
--with-ppl=${prefix} \
--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 \
- LD_FOR_TARGET=/usr/bin/ld \
- NM_FOR_TARGET=/usr/bin/nm \
- OBJDUMP_FOR_TARGET=/usr/bin/objdump \
- RANLIB_FOR_TARGET=/usr/bin/ranlib \
- STRIP_FOR_TARGET=/usr/bin/strip
+ --disable-multilib \
+ --with-as=${prefix}/bin/as \
+ --with-ld=${prefix}/bin/ld \
+ --with-ar=${prefix}/bin/ar
+configure.env-append \
+ AR_FOR_TARGET=${prefix}/bin/ar \
+ AS_FOR_TARGET=${prefix}/bin/as \
+ LD_FOR_TARGET=${prefix}/bin/ld \
+ NM_FOR_TARGET=${prefix}/bin/nm \
+ OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+ RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+ STRIP_FOR_TARGET=${prefix}/bin/strip
+
# http://trac.macports.org/ticket/29104
if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler clang
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2012-04-17 02:35:28 UTC (rev 92063)
+++ trunk/dports/lang/gcc46/Portfile 2012-04-17 03:12:49 UTC (rev 92064)
@@ -6,6 +6,7 @@
name gcc46
epoch 1
version 4.6.3
+revision 1
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -43,8 +44,10 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl
-depends_run port:gcc_select
+depends_run port:gcc_select port:ld64 port:cctools
+depends_skip_archcheck-append gcc_select ld64 cctools
+
set major 4.6
worksrcdir build
@@ -78,18 +81,22 @@
--with-ppl=${prefix} \
--enable-stage1-checking \
--disable-multilib \
- --enable-lto
-# do NOT use MacPorts binutils -- they do not work
-configure.env-append AR_FOR_TARGET=/usr/bin/ar \
- AS_FOR_TARGET=/usr/bin/as \
- LD_FOR_TARGET=/usr/bin/ld \
- NM_FOR_TARGET=/usr/bin/nm \
- OBJDUMP_FOR_TARGET=/usr/bin/objdump \
- RANLIB_FOR_TARGET=/usr/bin/ranlib \
- STRIP_FOR_TARGET=/usr/bin/strip \
- OTOOL=/usr/bin/otool \
- OTOOL64=/usr/bin/otool
+ --enable-lto \
+ --with-as=${prefix}/bin/as \
+ --with-ld=${prefix}/bin/ld \
+ --with-ar=${prefix}/bin/ar
+configure.env-append \
+ AR_FOR_TARGET=${prefix}/bin/ar \
+ AS_FOR_TARGET=${prefix}/bin/as \
+ LD_FOR_TARGET=${prefix}/bin/ld \
+ NM_FOR_TARGET=${prefix}/bin/nm \
+ OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+ RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+ STRIP_FOR_TARGET=${prefix}/bin/strip \
+ OTOOL=${prefix}/bin/otool \
+ OTOOL64=${prefix}/bin/otool
+
# http://trac.macports.org/ticket/29104
if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler clang
Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile 2012-04-17 02:35:28 UTC (rev 92063)
+++ trunk/dports/lang/gcc47/Portfile 2012-04-17 03:12:49 UTC (rev 92064)
@@ -6,7 +6,7 @@
name gcc47
epoch 1
version 4.7.0
-revision 1
+revision 2
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -45,8 +45,10 @@
sha256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl
-depends_run port:gcc_select
+depends_run port:gcc_select port:ld64 port:cctools
+depends_skip_archcheck-append gcc_select ld64 cctools
+
set major 4.7
worksrcdir build
@@ -78,16 +80,19 @@
--with-ppl=${prefix} \
--enable-stage1-checking \
--disable-multilib \
- --enable-lto
-# do NOT use MacPorts binutils -- they do not work
+ --enable-lto \
+ --with-as=${prefix}/bin/as \
+ --with-ld=${prefix}/bin/ld \
+ --with-ar=${prefix}/bin/ar
+
configure.env-append \
- AR_FOR_TARGET=/usr/bin/ar \
- AS_FOR_TARGET=/usr/bin/as \
- LD_FOR_TARGET=/usr/bin/ld \
- NM_FOR_TARGET=/usr/bin/nm \
- OBJDUMP_FOR_TARGET=/usr/bin/objdump \
- RANLIB_FOR_TARGET=/usr/bin/ranlib \
- STRIP_FOR_TARGET=/usr/bin/strip
+ AR_FOR_TARGET=${prefix}/bin/ar \
+ AS_FOR_TARGET=${prefix}/bin/as \
+ LD_FOR_TARGET=${prefix}/bin/ld \
+ NM_FOR_TARGET=${prefix}/bin/nm \
+ OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+ RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+ STRIP_FOR_TARGET=${prefix}/bin/strip
# http://trac.macports.org/ticket/29104
if {${configure.compiler} == "llvm-gcc-4.2"} {
Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile 2012-04-17 02:35:28 UTC (rev 92063)
+++ trunk/dports/lang/gcc48/Portfile 2012-04-17 03:12:49 UTC (rev 92064)
@@ -5,6 +5,7 @@
name gcc48
version 4.8-20120415
+revision 1
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -31,8 +32,10 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl
-depends_run port:gcc_select
+depends_run port:gcc_select port:ld64 port:cctools
+depends_skip_archcheck-append gcc_select ld64 cctools
+
set major 4.8
worksrcdir build
@@ -63,16 +66,19 @@
--with-ppl=${prefix} \
--enable-stage1-checking \
--disable-multilib \
- --enable-lto
-# do NOT use MacPorts binutils -- they do not work
+ --enable-lto \
+ --with-as=${prefix}/bin/as \
+ --with-ld=${prefix}/bin/ld \
+ --with-ar=${prefix}/bin/ar
+
configure.env-append \
- AR_FOR_TARGET=/usr/bin/ar \
- AS_FOR_TARGET=/usr/bin/as \
- LD_FOR_TARGET=/usr/bin/ld \
- NM_FOR_TARGET=/usr/bin/nm \
- OBJDUMP_FOR_TARGET=/usr/bin/objdump \
- RANLIB_FOR_TARGET=/usr/bin/ranlib \
- STRIP_FOR_TARGET=/usr/bin/strip
+ AR_FOR_TARGET=${prefix}/bin/ar \
+ AS_FOR_TARGET=${prefix}/bin/as \
+ LD_FOR_TARGET=${prefix}/bin/ld \
+ NM_FOR_TARGET=${prefix}/bin/nm \
+ OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+ RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+ STRIP_FOR_TARGET=${prefix}/bin/strip
# http://trac.macports.org/ticket/29104
if {${configure.compiler} == "llvm-gcc-4.2"} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120416/18f50f77/attachment.html>
More information about the macports-changes
mailing list