Title: [145574] trunk/Source/WebCore
Revision
145574
Author
gav...@chromium.org
Date
2013-03-12 12:43:41 -0700 (Tue, 12 Mar 2013)

Log Message

[chromium] Use lipo(1) rather than file(1) to list library architectures.
https://bugs.webkit.org/show_bug.cgi?id=111147

Parsing file(1) output can be fragile; this patch replaces a use of file(1) to get
the architecture list of a library with an invocation of lipo(1), which should be more
stable.

Reviewed by Nico Weber.

No new tests, since adjust_visibility.sh doesn't have a test.

* WebCore.gyp/mac/adjust_visibility.sh:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (145573 => 145574)


--- trunk/Source/WebCore/ChangeLog	2013-03-12 18:45:10 UTC (rev 145573)
+++ trunk/Source/WebCore/ChangeLog	2013-03-12 19:43:41 UTC (rev 145574)
@@ -1,3 +1,18 @@
+2013-03-12  Gavin Peters  <gav...@chromium.org>
+
+        [chromium] Use lipo(1) rather than file(1) to list library architectures.
+        https://bugs.webkit.org/show_bug.cgi?id=111147
+
+        Parsing file(1) output can be fragile; this patch replaces a use of file(1) to get
+        the architecture list of a library with an invocation of lipo(1), which should be more
+        stable.
+
+        Reviewed by Nico Weber.
+
+        No new tests, since adjust_visibility.sh doesn't have a test.
+
+        * WebCore.gyp/mac/adjust_visibility.sh:
+
 2013-03-12  Viatcheslav Ostapenko  <sl.ostape...@samsung.com>
 
         Webkit unable to show gifs with applcation extension string shorter than 11 bytes

Modified: trunk/Source/WebCore/WebCore.gyp/mac/adjust_visibility.sh (145573 => 145574)


--- trunk/Source/WebCore/WebCore.gyp/mac/adjust_visibility.sh	2013-03-12 18:45:10 UTC (rev 145573)
+++ trunk/Source/WebCore/WebCore.gyp/mac/adjust_visibility.sh	2013-03-12 19:43:41 UTC (rev 145574)
@@ -55,7 +55,7 @@
 
 # ar doesn't operate on fat files.  Figure out what architectures are
 # involved.
-ARCHS=$(file "${INPUT}" | sed -Ene 's/^.*\(for architecture (.+)\):.*$/\1/p')
+ARCHS=$(lipo -info "${INPUT}" | sed -Ene 's/^.* are: (.+)/\1/p')
 if [ -z "${ARCHS}" ] ; then
   ARCHS=self
 fi
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to