[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f7954470
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>
[Qt][Mac] Build fails after adding ICU support (r105997).
......
......@@ -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")
}
......
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>
Stop calling Element::ensureShadowRoot in Internals.
......@@ -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
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment