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

[jeremyhu at macports.org]

Revision: 109861
          https://trac.macports.org/changeset/109861
Author:   jeremyhu at macports.org
Date:     2013-08-20 15:46:45 -0700 (Tue, 20 Aug 2013)
Log Message:
-----------
muniversal: Strip arch flags out of shell scripts on merge

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	2013-08-20 22:37:37 UTC (rev 109860)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2013-08-20 22:46:45 UTC (rev 109861)
@@ -658,7 +658,10 @@
                                             }
                                         }
                                         default {
-                                            if { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"} ] } {
+                                            if { ! [catch {system "test `head -c2 ${dir1}/${fl}` == '#!'"}] } {
+                                                # Shell script, hopefully striping out arch flags works...
+                                                mergeStripArchFlags ${dir1} ${dir2} ${dir} ${fl}
+                                            } elseif { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"} ] } {
                                                 # diff worked
                                                 ui_debug "universal: merge: used diff to create ${prefixDir}/${fl}"
                                             } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130820/c8f6819a/attachment.html>