[81091] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[jeremyhu at macports.org]

Revision: 81091
          http://trac.macports.org/changeset/81091
Author:   jeremyhu at macports.org
Date:     2011-07-25 08:52:41 -0700 (Mon, 25 Jul 2011)
Log Message:
-----------
muniversal: Try using libtool if lipo fails, lipo can't sew together LLVM bitcode.  #29842

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2011-07-25 15:10:53 UTC (rev 81090)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2011-07-25 15:52:41 UTC (rev 81091)
@@ -451,12 +451,15 @@
                             ui_debug "universal: merge: ${prefixDir}/${fl} is identical in ${base1} and ${base2}"
                         } else {
                             # Actually try to merge the files
-                            # First try lipo
+                            # First try lipo, then libtool
                             if { ! [catch {system "/usr/bin/lipo -create \"${dir1}/${fl}\" \"${dir2}/${fl}\" -output \"${dir}/${fl}\""}] } {
                                 # lipo worked
                                 ui_debug "universal: merge: lipo created ${prefixDir}/${fl}"
+                            } elseif { ! [catch {system "/usr/bin/libtool \"${dir1}/${fl}\" \"${dir2}/${fl}\" -o \"${dir}/${fl}\""}] } {
+                                # libtool worked
+                                ui_debug "universal: merge: libtool created ${prefixDir}/${fl}"
                             } else {
-                                # lipo has failed, so assume they are text files to be merged
+                                # lipo and libtool have failed, so assume they are text files to be merged
                                 set dontdiff no
                                 foreach dont ${merger_dont_diff} {
                                     if { ${dont}=="${prefixDir}/${fl}" } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110725/8c64b234/attachment-0001.html>