Changeset 94075 in webkit for trunk/Source/JavaScriptCore/wtf/wtf.pri

Timestamp:

Aug 30, 2011, 6:57:37 AM (14 years ago)

Author:

Ademar Reis

Message:

[Qt] Do not unconditionally use pkg-config in .pro files
​https://bugs.webkit.org/show_bug.cgi?id=67055

Reviewed by Andreas Kling.

Original patch from Rohan McGovern <​[email protected]>

Using the first pkg-config in PATH is prone to errors when cross
compiling inside the Qt repository (using Qt's build-system).

This patch protect calls for pkg-config with
!contains(QT_CONFIG, no-pkg-config). no-pkg-config is added to
QT_CONFIG by Qt's 'configure' when cross-compiling on systems
without pkg-config.

The respective change in Qt's configure has been submited already.

No new tests as this is just a build change.

Source/JavaScriptCore:

• wtf/wtf.pri: protect pkg-config calls

Source/WebCore:

• features.pri: protect pkg-config calls

File:

• trunk/Source/JavaScriptCore/wtf/wtf.pri (modified) (1 diff)

trunk/Source/JavaScriptCore/wtf/wtf.pri

@@ -43 +43 @@
 
 linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-    system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+    !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
         DEFINES += ENABLE_GLIB_SUPPORT=1
         PKGCONFIG += glib-2.0 gio-2.0