Title: [164286] releases/WebKitGTK/webkit-2.2
Revision
164286
Author
[email protected]
Date
2014-02-18 04:07:36 -0800 (Tue, 18 Feb 2014)

Log Message

Merge r163954 - 'ar T' is not portable and breaks the build on FreeBSD
https://bugs.webkit.org/show_bug.cgi?id=128596

Patch by Ryan Lortie <[email protected]> on 2014-02-12
Reviewed by Gustavo Noronha Silva.

Create thin archives only if we are using GNU ar.

* Source/autotools/SetupLibtool.m4:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.2/ChangeLog (164285 => 164286)


--- releases/WebKitGTK/webkit-2.2/ChangeLog	2014-02-18 12:05:35 UTC (rev 164285)
+++ releases/WebKitGTK/webkit-2.2/ChangeLog	2014-02-18 12:07:36 UTC (rev 164286)
@@ -1,3 +1,14 @@
+2014-02-12  Ryan Lortie  <[email protected]>
+
+        'ar T' is not portable and breaks the build on FreeBSD
+        https://bugs.webkit.org/show_bug.cgi?id=128596
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Create thin archives only if we are using GNU ar.
+
+        * Source/autotools/SetupLibtool.m4:
+
 2014-01-21  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Update NEWS and Versions.m4 for 2.2.4 release.

Modified: releases/WebKitGTK/webkit-2.2/Source/autotools/SetupLibtool.m4 (164285 => 164286)


--- releases/WebKitGTK/webkit-2.2/Source/autotools/SetupLibtool.m4	2014-02-18 12:05:35 UTC (rev 164285)
+++ releases/WebKitGTK/webkit-2.2/Source/autotools/SetupLibtool.m4	2014-02-18 12:07:36 UTC (rev 164286)
@@ -6,7 +6,11 @@
 AC_SUBST([LIBWEBKIT2GTK_VERSION])
 
 if test -z "$AR_FLAGS"; then
-    AR_FLAGS="cruT"
+    if "${AR:-ar}" -V | grep -q 'GNU ar'; then
+        AR_FLAGS="cruT"
+    else
+        AR_FLAGS="cru"
+    fi
 fi
 
 DOLT
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to