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

[jeremyhu at macports.org]

Revision: 80438
          http://trac.macports.org/changeset/80438
Author:   jeremyhu at macports.org
Date:     2011-07-12 22:52:35 -0700 (Tue, 12 Jul 2011)
Log Message:
-----------
apple-gcc42: Build fix for Leopard/i386, tested ppc

Modified Paths:
--------------
    trunk/dports/lang/apple-gcc42/Portfile
    trunk/dports/lang/apple-gcc42/files/suffix.patch

Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile	2011-07-13 04:45:59 UTC (rev 80437)
+++ trunk/dports/lang/apple-gcc42/Portfile	2011-07-13 05:52:35 UTC (rev 80438)
@@ -98,7 +98,6 @@
 	# arch returns i386 even when we want x86_64
 	reinplace "/^BUILD=/ s:arch:echo ${build_arch}:" ${worksrcpath}/build_gcc
 
-	# ppc not tested, but it should hopefully work...
 	if {${build_arch} == "ppc"} {
 		reinplace "/^PPC_SYSROOT=/ s:=.*$:=/:" ${worksrcpath}/build_gcc
 	} elseif {[file exists ${developer_dir}/SDKs/MacOSX10.5.sdk]} {

Modified: trunk/dports/lang/apple-gcc42/files/suffix.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/suffix.patch	2011-07-13 04:45:59 UTC (rev 80437)
+++ trunk/dports/lang/apple-gcc42/files/suffix.patch	2011-07-13 05:52:35 UTC (rev 80438)
@@ -1,6 +1,6 @@
---- build_gcc.orig	2011-07-07 11:07:47.000000000 -0700
-+++ build_gcc	2011-07-07 11:24:41.000000000 -0700
-@@ -177,7 +177,10 @@ CONFIGFLAGS="--disable-checking --enable
+--- build_gcc.orig	2011-07-12 22:44:19.000000000 -0700
++++ build_gcc	2011-07-12 22:45:31.000000000 -0700
+@@ -174,7 +174,10 @@ CONFIGFLAGS="--disable-checking --enable
    --prefix=$DEST_ROOT \
    --mandir=\${prefix}/share/man \
    --enable-languages=$LANGUAGES \
@@ -12,7 +12,7 @@
    --with-slibdir=/usr/lib \
    --build=$BUILD-apple-darwin$DARWIN_VERS"
  
-@@ -230,7 +233,7 @@ make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-
+@@ -227,7 +230,7 @@ make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-
  
  # Add the compiler we just built to the path, giving it appropriate names.
  D=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin
@@ -88,29 +88,36 @@
  done
  
  # APPLE LOCAL begin native compiler support
-@@ -471,19 +474,19 @@ for t in $LIBGOMP_TARGETS ; do
+@@ -470,20 +473,20 @@ LIBGOMP_HOSTS=`echo $HOSTS | $OMIT_X86_6
+ for t in $LIBGOMP_TARGETS ; do
      for h in $LIBGOMP_HOSTS ; do
  	if [ $h = $t ] ; then
- 	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/libgomp.a \
+-	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/libgomp.a \
 -		.$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
-+		.$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
- 	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/libgomp.spec \
+-	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/libgomp.spec \
 -		.$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
++	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/apple-gcc42/libgomp.a \
 +		.$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
++	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/apple-gcc42/libgomp.spec \
++		.$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
  	    if [ $h = 'powerpc' ] ; then
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.a \
+-		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.a \
 -		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
-+		    .$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.spec \
+-		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.spec \
 -		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
++		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/apple-gcc42/ppc64/libgomp.a \
 +		    .$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
++		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/apple-gcc42/ppc64/libgomp.spec \
++		    .$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
  	    elif [ $h = 'i686' ] ; then
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgomp.a \
+-		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgomp.a \
 -		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
-+		    .$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgomp.spec \
+-		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgomp.spec \
 -		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
++		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/apple-gcc42/x86_64/libgomp.a \
 +		    .$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
++		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/apple-gcc42/x86_64/libgomp.spec \
++		    .$DEST_ROOT/lib/apple-gcc42/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
  	    fi
  	fi
      done
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110712/3d291047/attachment.html>