[109382] trunk/dports/lang

[jeremyhu at macports.org]

Revision: 109382
          https://trac.macports.org/changeset/109382
Author:   jeremyhu at macports.org
Date:     2013-08-14 09:39:54 -0700 (Wed, 14 Aug 2013)
Log Message:
-----------
libgcc{,-devel}: Don't create a merged dylib if the platform doesn't have it (#40098, #40100).

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

Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile	2013-08-14 16:39:10 UTC (rev 109381)
+++ trunk/dports/lang/gcc48/Portfile	2013-08-14 16:39:54 UTC (rev 109382)
@@ -144,6 +144,13 @@
         set dylibs {libgcc_s.1.dylib libgfortran.3.dylib libquadmath.0.dylib libstdc++.6.dylib libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.0.dylib libatomic.1.dylib}
 
         foreach dylib ${dylibs} {
+            # Different OS versions (eg: Leopard) or architectures (eg: PPC) don't produce all the dylibs
+            # https://trac.macports.org/ticket/40098
+            # https://trac.macports.org/ticket/40100
+            if {! [file exists ${destroot}${prefix}/lib/libgcc/${dylib}]} {
+                continue
+            }
+
             move ${destroot}${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/libgcc.merged
             if {[variant_isset universal]} {
                 foreach archdir [glob ${destroot}${prefix}/lib/libgcc/*/] {

Modified: trunk/dports/lang/gcc49/Portfile
===================================================================
--- trunk/dports/lang/gcc49/Portfile	2013-08-14 16:39:10 UTC (rev 109381)
+++ trunk/dports/lang/gcc49/Portfile	2013-08-14 16:39:54 UTC (rev 109382)
@@ -145,6 +145,13 @@
         set dylibs {libgcc_s.1.dylib libgfortran.3.dylib libquadmath.0.dylib libstdc++.6.dylib libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.0.dylib libatomic.1.dylib}
 
         foreach dylib ${dylibs} {
+            # Different OS versions (eg: Leopard) or architectures (eg: PPC) don't produce all the dylibs
+            # https://trac.macports.org/ticket/40098
+            # https://trac.macports.org/ticket/40100
+            if {! [file exists ${destroot}${prefix}/lib/libgcc/${dylib}]} {
+                continue
+            }
+
             move ${destroot}${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/libgcc.merged
             if {[variant_isset universal]} {
                 foreach archdir [glob ${destroot}${prefix}/lib/libgcc/*/] {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130814/099ef436/attachment.html>