[69846] trunk/dports/lang/gcc43
jmr at macports.org
jmr at macports.org
Sun Jul 18 17:29:37 PDT 2010
Revision: 69846
http://trac.macports.org/changeset/69846
Author: jmr at macports.org
Date: 2010-07-18 17:29:35 -0700 (Sun, 18 Jul 2010)
Log Message:
-----------
gcc43: apply darwin10 and multilib fixes from #22148 and #22116, though multilib still seems to be broken
Modified Paths:
--------------
trunk/dports/lang/gcc43/Portfile
Added Paths:
-----------
trunk/dports/lang/gcc43/files/darwin10.diff
trunk/dports/lang/gcc43/files/i386_multilib.diff
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2010-07-19 00:16:25 UTC (rev 69845)
+++ trunk/dports/lang/gcc43/Portfile 2010-07-19 00:29:35 UTC (rev 69846)
@@ -51,12 +51,9 @@
use_bzip2 yes
-# gmp and mpfr are not universal
-universal_variant no
-
depends_lib port:gmp port:mpfr port:libiconv
-patchfiles Make-lang.in.diff
+patchfiles Make-lang.in.diff darwin10.diff i386_multilib.diff
patch.dir ${workpath}/gcc-${version}
set major 4.3
@@ -68,10 +65,11 @@
}
# 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}
}
@@ -87,7 +85,8 @@
--program-suffix=-mp-${major} \
--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gmp=${prefix} \
- --with-mpfr=${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 \
@@ -117,10 +116,6 @@
xinstall -m 444 ${filespath}/mp-gcc43 ${destroot}${prefix}/etc/select/gcc/
}
-platform powerpc {
- configure.args-append --disable-multilib
-}
-
# Java support does not compile on 10.4/x86
platform darwin 8 i386 {
configure.args-delete --enable-languages=c,c++,objc,obj-c++,java,fortran
@@ -140,7 +135,24 @@
# --with-ar=${prefix}/bin/odar
#}
+# multilib broken, ticket #22148
+universal_variant no
+
+#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
+# configure.args-append --enable-multilib
+#}
+
livecheck.type regex
livecheck.url http://gcc.gnu.org/gcc-4.3/
livecheck.regex GCC (4\\.3\\.\[0-9\])
-
Added: trunk/dports/lang/gcc43/files/darwin10.diff
===================================================================
--- trunk/dports/lang/gcc43/files/darwin10.diff (rev 0)
+++ trunk/dports/lang/gcc43/files/darwin10.diff 2010-07-19 00:29:35 UTC (rev 69846)
@@ -0,0 +1,71 @@
+--- gcc/config.gcc.orig 2009-10-18 12:07:26.000000000 -0400
++++ gcc/config.gcc 2009-10-18 12:07:46.000000000 -0400
+@@ -417,7 +417,7 @@
+ *-*-darwin*)
+ tm_file="${tm_file} darwin.h"
+ case ${target} in
+- *-*-darwin9*)
++ *-*-darwin9* | *-*-darwin1[0-9]*)
+ tm_file="${tm_file} darwin9.h"
+ ;;
+ esac
+--- configure.orig 2009-10-18 12:09:09.000000000 -0400
++++ configure 2009-10-18 12:10:07.000000000 -0400
+@@ -2133,7 +2133,7 @@
+ *-*-chorusos)
+ noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
+ ;;
+- powerpc-*-darwin* | i[3456789]86-*-darwin* | x86_64-*-darwin9*)
++ powerpc-*-darwin* | i[3456789]86-*-darwin* | x86_64-*-darwin9* | x86_64-*-darwin1[0-9]*)
+ noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+--- configure.ac.orig 2009-10-18 12:12:07.000000000 -0400
++++ configure.ac 2009-10-18 12:15:37.000000000 -0400
+@@ -410,7 +410,7 @@
+ *-*-chorusos)
+ noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
+ ;;
+- powerpc-*-darwin* | i[[3456789]]86-*-darwin* | x86_64-*-darwin9*)
++ powerpc-*-darwin* | i[[3456789]]86-*-darwin* | x86_64-*-darwin9* | x86_64-*-darwin1[[0-9]]*)
+ noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+--- libjava/configure.orig 2009-10-18 12:17:53.000000000 -0400
++++ libjava/configure 2009-10-18 12:19:04.000000000 -0400
+@@ -27297,7 +27297,7 @@
+ m68*-*-linux*)
+ SIGNAL_HANDLER=include/dwarf2-signal.h
+ ;;
+- powerpc*-*-darwin* | i?86-*-darwin9* | x86_64-*-darwin9*)
++ powerpc*-*-darwin* | i?86-*-darwin9* | i?86-*-darwin1[0-9]* | x86_64-*-darwin9* | x86_64-*-darwin1[0-9]*)
+ SIGNAL_HANDLER=include/darwin-signal.h
+ ;;
+ *)
+--- libjava/configure.ac.orig 2009-10-18 12:19:42.000000000 -0400
++++ libjava/configure.ac 2009-10-18 12:20:18.000000000 -0400
+@@ -1563,7 +1563,7 @@
+ m68*-*-linux*)
+ SIGNAL_HANDLER=include/dwarf2-signal.h
+ ;;
+- powerpc*-*-darwin* | i?86-*-darwin9* | x86_64-*-darwin9*)
++ powerpc*-*-darwin* | i?86-*-darwin9* | i?86-*-darwin1[[0-9]]* | x86_64-*-darwin9* | x86_64-*-darwin1[[0-9]]*)
+ SIGNAL_HANDLER=include/darwin-signal.h
+ ;;
+ *)
+--- libjava/configure.host.orig 2009-10-18 12:38:02.000000000 -0400
++++ libjava/configure.host 2009-10-18 12:38:28.000000000 -0400
+@@ -295,11 +295,11 @@
+ slow_pthread_self=
+ can_unwind_signal=no
+ ;;
+- i?86-*-darwin9*)
++ i?86-*-darwin9* | i?86-*-darwin1[0-9]*)
+ can_unwind_signal=yes
+ DIVIDESPEC=-f%{m32:no-}%{!m32:%{!m64:no-}}%{m64:}use-divide-subroutine
+ ;;
+- x86_64-*-darwin9*)
++ x86_64-*-darwin9* | x86_64-*-darwin1[0-9]*)
+ enable_hash_synchronization_default=yes
+ slow_pthread_self=
+ can_unwind_signal=yes
Added: trunk/dports/lang/gcc43/files/i386_multilib.diff
===================================================================
--- trunk/dports/lang/gcc43/files/i386_multilib.diff (rev 0)
+++ trunk/dports/lang/gcc43/files/i386_multilib.diff 2010-07-19 00:29:35 UTC (rev 69846)
@@ -0,0 +1,14 @@
+--- gcc/config/i386/t-darwin64.orig 2009-10-18 12:21:43.000000000 -0400
++++ gcc/config/i386/t-darwin64 2009-10-18 12:22:21.000000000 -0400
+@@ -1,5 +1,11 @@
+ LIB2_SIDITI_CONV_FUNCS=yes
+ LIB2FUNCS_EXTRA = $(srcdir)/config/darwin-64.c
+
++MULTILIB_OPTIONS = m32
++MULTILIB_DIRNAMES = i386
++
++LIBGCC = stmp-multilib
++INSTALL_LIBGCC = install-multilib
++
+ softfp_wrap_start := '\#ifdef __x86_64__'
+ softfp_wrap_end := '\#endif'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100718/c743be18/attachment-0001.html>
More information about the macports-changes
mailing list