Ignore:
Timestamp:
Aug 20, 2013, 10:46:45 PM (6 years ago)
Author:
jeremyhu@…
Message:

muniversal: Strip arch flags out of shell scripts on merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

    r109860 r109861  
    659659                                        }
    660660                                        default {
    661                                             if { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"} ] } {
     661                                            if { ! [catch {system "test `head -c2 ${dir1}/${fl}` == '#!'"}] } {
     662                                                # Shell script, hopefully striping out arch flags works...
     663                                                mergeStripArchFlags ${dir1} ${dir2} ${dir} ${fl}
     664                                            } elseif { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"} ] } {
    662665                                                # diff worked
    663666                                                ui_debug "universal: merge: used diff to create ${prefixDir}/${fl}"
Note: See TracChangeset for help on using the changeset viewer.