Changeset 94075 in webkit

Timestamp:

Aug 30, 2011 6:57:37 AM (13 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 <​rohan.mcgovern@nokia.com>

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

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/wtf.pri (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/features.pri (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-08-30  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        [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 <rohan.mcgovern@nokia.com>
+
+        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.
+
+        * wtf/wtf.pri: protect pkg-config calls
+
 2011-08-29  Daniel Bates  <dbates@webkit.org>
 

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-30  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        [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 <rohan.mcgovern@nokia.com>
+
+        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.
+
+        * features.pri: protect pkg-config calls
+
 2011-08-30  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/features.pri

@@ -197 +197 @@
         DEFINES -= WTF_USE_QTKIT=0
     } else: 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_VIDEO=0
             DEFINES += ENABLE_VIDEO=1