[97713] trunk/dports/lang

[jeremyhu at macports.org]

Revision: 97713
          http://trac.macports.org//changeset/97713
Author:   jeremyhu at macports.org
Date:     2012-09-12 15:33:23 -0700 (Wed, 12 Sep 2012)
Log Message:
-----------
libstdcxx{,-devel}: Address a possible build failure, See #36116.

Modified Paths:
--------------
    trunk/dports/lang/gcc47/Portfile
    trunk/dports/lang/gcc48/Portfile

Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile	2012-09-12 21:59:36 UTC (rev 97712)
+++ trunk/dports/lang/gcc47/Portfile	2012-09-12 22:33:23 UTC (rev 97713)
@@ -127,9 +127,10 @@
     configure.args-delete --enable-languages=c,c++,objc,obj-c++,lto,fortran,java
     configure.args-append --enable-languages=c++
 
-    configure.args-append --disable-bootstrap
+    # See http://trac.macports.org/ticket/36116 for why we can't do this yet
+    # configure.args-append --disable-bootstrap
+    # build.target        all
 
-    build.target        all
     destroot.target     install-target-libstdc++-v3
 
     post-destroot {
@@ -139,6 +140,9 @@
 
         # base doesn't like the + in this depspec path:lib/libstdc++.dylib:libstdcxx
         system "touch ${destroot}${prefix}/lib/.libstdcxx"
+
+        # Some linkers don't optimize this unused link away.  TODO: Fix this in the build system
+        system "install_name_tool -change ${prefix}/lib/libgcc_s.1.dylib /usr/lib/libgcc_s.1.dylib ${destroot}${prefix}/lib/libstdc++.6.dylib"
     }
 } else {
 post-destroot {

Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile	2012-09-12 21:59:36 UTC (rev 97712)
+++ trunk/dports/lang/gcc48/Portfile	2012-09-12 22:33:23 UTC (rev 97713)
@@ -108,9 +108,10 @@
     configure.args-delete --enable-languages=c,c++,objc,obj-c++,lto,fortran,java
     configure.args-append --enable-languages=c++
 
-    configure.args-append --disable-bootstrap
+    # See http://trac.macports.org/ticket/36116 for why we can't do this yet
+    # configure.args-append --disable-bootstrap
+    # build.target        all
 
-    build.target        all
     destroot.target     install-target-libstdc++-v3
 
     post-destroot {
@@ -120,6 +121,9 @@
 
         # base doesn't like the + in this depspec path:lib/libstdc++.dylib:libstdcxx
         system "touch ${destroot}${prefix}/lib/.libstdcxx"
+
+        # Some linkers don't optimize this unused link away.  TODO: Fix this in the build system
+        system "install_name_tool -change ${prefix}/lib/libgcc_s.1.dylib /usr/lib/libgcc_s.1.dylib ${destroot}${prefix}/lib/libstdc++.6.dylib"
     }
 } else {
 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120912/69acc82c/attachment.html>