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

[jeremyhu at macports.org]

Revision: 91484
          https://trac.macports.org/changeset/91484
Author:   jeremyhu at macports.org
Date:     2012-04-02 16:52:00 -0700 (Mon, 02 Apr 2012)
Log Message:
-----------
apple-gcc42: Fix as and ld symlinks, build with libunwind-headers present (#32041).

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

Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile	2012-04-02 23:50:48 UTC (rev 91483)
+++ trunk/dports/lang/apple-gcc42/Portfile	2012-04-02 23:52:00 UTC (rev 91484)
@@ -6,7 +6,7 @@
 name			apple-gcc42
 version			5666.3
 set gcc_version		4.2.1
-revision		3
+revision		4
 categories		lang
 platforms		darwin
 license         GPL-2
@@ -45,6 +45,9 @@
 #                    rmd160  bb4b256f7e7779361214593343821a127ee78d1a
 
 # Needed for gfortran:
+#files/other_langs.patch:
+#+  --with-gmp=$DEST_ROOT \
+#+  --with-mpfr=$DEST_ROOT \
 #depends_lib             port:gmp port:mpfr port:libiconv
 
 depends_run             port:gcc_select
@@ -141,16 +144,7 @@
 	}
 }
 
-pre-build {
-    foreach {badport badfile} "libunwind-headers ${prefix}/include/unwind.h" {
-        if {[file exists ${badfile}]} {
-            ui_error "${name} cannot be built while ${badport} is active."
-            ui_error "Please deactivate ${badport} and try again."
-            ui_error "You can reactivate ${badport} again later."
-            return -code error "${badport} is installed"
-        }
-    }
-}
+compiler.cpath
 
 # TODO: Use MacPorts dependencies
 build.env \
@@ -193,7 +187,20 @@
 # TODO: split the build_gcc script into two to better match MacPorts
 build.target install
 destroot {}
+post-destroot {
+    delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/as
+    ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/as
+    delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/ld
+    ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/ld
 
+    if {[string match "*ppc*" ${build_targets}]} {
+        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/as
+        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/as
+        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/ld
+        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/ld
+    }
+}
+
 livecheck.type		regex
 livecheck.url		[lindex ${master_sites} 0]
 livecheck.regex		gcc-(\\d+(?:\\.\\d+)*)\\.tar

Modified: trunk/dports/lang/apple-gcc42/files/other_langs.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/other_langs.patch	2012-04-02 23:50:48 UTC (rev 91483)
+++ trunk/dports/lang/apple-gcc42/files/other_langs.patch	2012-04-02 23:52:00 UTC (rev 91484)
@@ -1,13 +1,11 @@
 --- build_gcc.orig	2011-07-08 00:24:49.000000000 -0700
 +++ build_gcc	2011-07-08 00:31:49.000000000 -0700
-@@ -178,9 +178,14 @@ CONFIGFLAGS="--disable-checking  \
+@@ -178,9 +178,12 @@ CONFIGFLAGS="--disable-checking  \
    --libdir=$DEST_ROOT/lib/apple-gcc42 \
    --includedir=$DEST_ROOT/include/apple-gcc42 \
    --program-suffix=-apple-$MAJ_VERS \
 +  --with-system-zlib \
 +  --disable-nls \
-+  --with-gmp=$DEST_ROOT \
-+  --with-mpfr=$DEST_ROOT \
    --with-slibdir=/usr/lib \
    --build=$BUILD-apple-darwin$DARWIN_VERS"
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120402/c58e9d1e/attachment.html>