Changeset 106651 in webkit

Timestamp:

Feb 3, 2012 5:05:38 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fix build when cross-compiling
​https://bugs.webkit.org/show_bug.cgi?id=77634

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-02-03
Reviewed by Tor Arne Vestbø.

Source/WebKit2:

• WebKit2.pri: Link in -lrt on linux mkspecs, regardless of whether gcc

is in use or not. More specifically this fixes the case where the makespace
is not linux-g++* but for a cross-compiling one like linux-arm-gnueabi-g++.

Source/WTF:

• WTF.pri: Don't use icu-config for determining the library search

path and libraries needed for ICU. Either we use icu-config for includes
_and_ libraries or we don't. Right now we assume that icu is a system library
and expect the headers in the default include search pathes (/usr/include for example).
However we use icu-config to figure out where the libraries are, which breaks when
cross-compiling, because icu-config isn't cross-compile friendly (I wish icu was using
pkg-config). I think for the time being we should require ICU as a _system_ library,
which implies the header and library availability in default search paths. This also
makes the build succeed when cross-compiling with --sysroot.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/WTF.pri (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebKit2.pri (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix build when cross-compiling
+        https://bugs.webkit.org/show_bug.cgi?id=77634
+
+        Reviewed by Tor Arne Vestbø.
+
+        * WTF.pri: Don't use icu-config for determining the library search
+        path and libraries needed for ICU. Either we use icu-config for includes
+        _and_ libraries or we don't. Right now we assume that icu is a system library
+        and expect the headers in the default include search pathes (/usr/include for example).
+        However we use icu-config to figure out where the libraries are, which breaks when
+        cross-compiling, because icu-config isn't cross-compile friendly (I wish icu was using
+        pkg-config). I think for the time being we should require ICU as a _system_ library,
+        which implies the header and library availability in default search paths. This also
+        makes the build succeed when cross-compiling with --sysroot.
+
 2012-01-27  Zeno Albisser  <zeno@webkit.org>
 

trunk/Source/WTF/WTF.pri

@@ -26 +26 @@
     } else {
         contains(QT_CONFIG,icu) {
-            unix: LIBS += $$system(icu-config --ldflags-searchpath --ldflags-libsonly)
-            else: LIBS += -licuin
+            LIBS += -licui18n -licuuc -licudata
         } else {
             error("To build QtWebKit with Qt 5 you need ICU")

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix build when cross-compiling
+        https://bugs.webkit.org/show_bug.cgi?id=77634
+
+        Reviewed by Tor Arne Vestbø.
+
+        * WebKit2.pri: Link in -lrt on linux mkspecs, regardless of whether gcc
+        is in use or not. More specifically this fixes the case where the makespace
+        is not linux-g++* but for a cross-compiling one like linux-arm-gnueabi-g++.
+
 2012-02-03  Shinya Kawanaka  <shinyak@google.com>
 

trunk/Source/WebKit2/WebKit2.pri

@@ -62 +62 @@
 INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR
 
-linux-g++*: {
+linux-*: {
     # -lrt is required for shm_open and shm_unlink.
     LIBS += -lrt