Title: [139570] trunk/Tools
- Revision
- 139570
- Author
- [email protected]
- Date
- 2013-01-13 09:18:00 -0800 (Sun, 13 Jan 2013)
Log Message
Fix CONFIG missing link_pkgconfig on Windows
https://bugs.webkit.org/show_bug.cgi?id=106647
Some libraries (e.g. libxslt, libxml2 and sqlite3) fail to link
properly on Windows because they are added to PKGCONFIG but
CONFIG does not contain link_pkgconfig.
This is because link_pkgconfig is added in unix/default_pre.prf
which is only used for UNIX platforms. To fix this, move it to
the general default_pre.prf.
Patch by Jonathan Liu <[email protected]> on 2013-01-13
Reviewed by Simon Hausmann.
* qmake/mkspecs/features/default_pre.prf:
* qmake/mkspecs/features/unix/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139569 => 139570)
--- trunk/Tools/ChangeLog 2013-01-13 15:24:17 UTC (rev 139569)
+++ trunk/Tools/ChangeLog 2013-01-13 17:18:00 UTC (rev 139570)
@@ -1,3 +1,21 @@
+2013-01-13 Jonathan Liu <[email protected]>
+
+ Fix CONFIG missing link_pkgconfig on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=106647
+
+ Some libraries (e.g. libxslt, libxml2 and sqlite3) fail to link
+ properly on Windows because they are added to PKGCONFIG but
+ CONFIG does not contain link_pkgconfig.
+
+ This is because link_pkgconfig is added in unix/default_pre.prf
+ which is only used for UNIX platforms. To fix this, move it to
+ the general default_pre.prf.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/default_pre.prf:
+ * qmake/mkspecs/features/unix/default_pre.prf:
+
2013-01-12 Nico Weber <[email protected]>
nrwt/chromium: Don't prefer chromium over webkit build directories
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (139569 => 139570)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2013-01-13 15:24:17 UTC (rev 139569)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2013-01-13 17:18:00 UTC (rev 139570)
@@ -85,6 +85,9 @@
# Set some defaults for specific platforms
CONFIG += include_webinspector
+# Make sure we process the PKGCONFIG variable if applicable
+!mac: CONFIG += link_pkgconfig
+
# By default we enable "production build", and build-webkit, which is
# used by bots and developers, will disable it, to enable warnings etc.
CONFIG += production_build
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf (139569 => 139570)
--- trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2013-01-13 15:24:17 UTC (rev 139569)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2013-01-13 17:18:00 UTC (rev 139570)
@@ -16,9 +16,6 @@
# flag that can be used to test for either of these situations.
contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
-# Make sure we process the PKGCONFIG variable if applicable
-!mac: CONFIG += link_pkgconfig
-
# Reduce linking memory pressure on 32-bit debug builds on Linux
linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
