From a545488e4cf3e43f5a833d241dc88dbeb95d173a Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Fri, 3 Feb 2012 13:05:38 +0000 Subject: [PATCH] [Qt] Fix build when cross-compiling https://bugs.webkit.org/show_bug.cgi?id=77634 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Simon Hausmann 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. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106651 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WTF/ChangeLog | 17 +++++++++++++++++ Source/WTF/WTF.pri | 3 +-- Source/WebKit2/ChangeLog | 11 +++++++++++ Source/WebKit2/WebKit2.pri | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index 58d551c625d9..77d449075666 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,20 @@ +2012-02-03 Simon Hausmann + + [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 [Qt][Mac] Build fails after adding ICU support (r105997). diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index f7a68c3d7ee4..76cc40ff6236 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -25,8 +25,7 @@ haveQt(5) { LIBS += -licucore } 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") } diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 77ee310f2e54..9c6562cd6131 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,14 @@ +2012-02-03 Simon Hausmann + + [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 Stop calling Element::ensureShadowRoot in Internals. diff --git a/Source/WebKit2/WebKit2.pri b/Source/WebKit2/WebKit2.pri index 1fdcf26140f7..a82ee7787f38 100644 --- a/Source/WebKit2/WebKit2.pri +++ b/Source/WebKit2/WebKit2.pri @@ -61,7 +61,7 @@ INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/Api INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR -linux-g++*: { +linux-*: { # -lrt is required for shm_open and shm_unlink. LIBS += -lrt } -- 2.36.0