Changeset 97713

Timestamp:

Sep 12, 2012, 10:33:23 PM (12 years ago)

Author:

jeremyhu@…

Message:

libstdcxx{,-devel}: Address a possible build failure, See #36116.

Location:

trunk/dports/lang

Files:

• gcc47/Portfile (modified) (2 diffs)
• gcc48/Portfile (modified) (2 diffs)

trunk/dports/lang/gcc47/Portfile

@@ -128 +128 @@
     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
 
@@ -140 +141 @@
         # 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 {

trunk/dports/lang/gcc48/Portfile

@@ -109 +109 @@
     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
 
@@ -121 +122 @@
         # 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 {