[91172] trunk/dports/lang/apple-gcc42

[jeremyhu at macports.org]

Revision: 91172
          https://trac.macports.org/changeset/91172
Author:   jeremyhu at macports.org
Date:     2012-03-24 20:40:16 -0700 (Sat, 24 Mar 2012)
Log Message:
-----------
apple-gcc42: Add support for +universal, #31603

Modified Paths:
--------------
    trunk/dports/lang/apple-gcc42/Portfile

Added Paths:
-----------
    trunk/dports/lang/apple-gcc42/files/universal.patch

Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile	2012-03-25 02:07:52 UTC (rev 91171)
+++ trunk/dports/lang/apple-gcc42/Portfile	2012-03-25 03:40:16 UTC (rev 91172)
@@ -67,6 +67,7 @@
 # makeinfo.patch           : Fix version detection for makeinfo in configure scripts
 # werror-*.patch           : Fix compilation errors when building for x86_64
 # incpath.patch            : Don't prepend the -isysroot option argument to the compiler's own search paths
+# universal.patch          : Set $CBUILD to $CHOST if $CBUILD is x86_64 and $CHOST is i686 (ie, don't "cross-compile")
 patchfiles \
 	system-libstdc++.patch \
 	no-rm-system.patch \
@@ -77,7 +78,8 @@
 	other_langs.patch \
 	werror-c-incpath.patch \
 	werror-local-alloc.patch \
-	incpath.patch
+	incpath.patch \
+	universal.patch
 
 # gcj fails to build:
 # gcc/java/lang.c: In function 'java_init':
@@ -150,15 +152,15 @@
 
 # +universal is failing to build in some cases.
 # https://trac.macports.org/ticket/31603
-universal_variant       no
-#universal_variant       yes
-#if {[variant_isset universal]} {
-#	build.args-append \
-#		RC_ARCHS="${universal_archs}"
-#} else {
+#universal_variant       no
+universal_variant       yes
+if {[variant_isset universal]} {
 	build.args-append \
+		RC_ARCHS="${universal_archs}"
+} else {
+	build.args-append \
 		RC_ARCHS="${build_arch}"
-#}
+}
 
 set build_targets {i386}
 

Added: trunk/dports/lang/apple-gcc42/files/universal.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/universal.patch	                        (rev 0)
+++ trunk/dports/lang/apple-gcc42/files/universal.patch	2012-03-25 03:40:16 UTC (rev 91172)
@@ -0,0 +1,15 @@
+--- build_gcc	2012-03-24 15:27:20.000000000 -0700
++++ build_gcc	2012-03-24 16:08:24.000000000 -0700
+@@ -380,6 +380,12 @@ for h in $HOSTS ; do
+         else
+           T_CONFIGFLAGS="$T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS"
+         fi
++
++        # http://trac.macports.org/ticket/31603
++        if [ $h = "i686" ] && [ $BUILD = "x86_64" ] ; then
++          T_CONFIGFLAGS="$T_CONFIGFLAGS --build=$h-apple-darwin$DARWIN_VERS"
++        fi
++
+         $SRC_DIR/configure $T_CONFIGFLAGS || exit 1
+ 	# APPLE LOCAL end ARM ARM_CONFIGFLAGS
+       fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120324/c900fa2e/attachment.html>