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

[jeremyhu at macports.org]

Revision: 109904
          https://trac.macports.org/changeset/109904
Author:   jeremyhu at macports.org
Date:     2013-08-21 10:21:14 -0700 (Wed, 21 Aug 2013)
Log Message:
-----------
muniversal: Make arch flags stripping global

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-21 17:16:12 UTC (rev 109903)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2013-08-21 17:21:14 UTC (rev 109904)
@@ -465,9 +465,9 @@
             copy ${dir1}/${fl} ${tempfile1}
             copy ${dir2}/${fl} ${tempfile2}
 
-            reinplace {s:-arch  *[^ ][^ ]*::} ${tempfile1} ${tempfile2}
-            reinplace {s:-m32::} ${tempfile1} ${tempfile2}
-            reinplace {s:-m64::} ${tempfile1} ${tempfile2}
+            reinplace -E {s:-arch +[^ ]+::g} ${tempfile1} ${tempfile2}
+            reinplace {s:-m32::g} ${tempfile1} ${tempfile2}
+            reinplace {s:-m64::g} ${tempfile1} ${tempfile2}
 
             if { ! [catch {system "/usr/bin/cmp -s \"${tempfile1}\" \"${tempfile2}\""}] } {
                 # modified files are identical
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130821/4c7320a9/attachment-0001.html>