Title: [136837] trunk
Revision
136837
Author
[email protected]
Date
2012-12-06 06:02:31 -0800 (Thu, 06 Dec 2012)

Log Message

[Qt][Mac] Fix libxslt and libxml2 config tests
https://bugs.webkit.org/show_bug.cgi?id=104164

Reviewed by Simon Hausmann.

Source/WebCore:

Since libxml2 is a dependency for libxslt and is not used
standalone the configurations for it should also depend on
whether XSLT is enabled.
Also avoid using pkg-config on Mac, instead use direct
include paths and add needed libraries to the linker.

No new tests needed.

* WebCore.pri:

Tools:

We should not use pkg-config on Mac instead use direct include
paths and add needed libraries to the linker options to detect
libxslt and libxml2 provided by the system.
Previously we would always fall back to qtxmlpatterns.

* qmake/config.tests/libxml2/libxml2.pro:
* qmake/config.tests/libxslt/libxslt.pro:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (136836 => 136837)


--- trunk/Source/WebCore/ChangeLog	2012-12-06 13:55:54 UTC (rev 136836)
+++ trunk/Source/WebCore/ChangeLog	2012-12-06 14:02:31 UTC (rev 136837)
@@ -1,3 +1,20 @@
+2012-12-06  Andras Becsi  <[email protected]>
+
+        [Qt][Mac] Fix libxslt and libxml2 config tests
+        https://bugs.webkit.org/show_bug.cgi?id=104164
+
+        Reviewed by Simon Hausmann.
+
+        Since libxml2 is a dependency for libxslt and is not used
+        standalone the configurations for it should also depend on
+        whether XSLT is enabled.
+        Also avoid using pkg-config on Mac, instead use direct
+        include paths and add needed libraries to the linker.
+
+        No new tests needed.
+
+        * WebCore.pri:
+
 2012-12-06  Shinya Kawanaka  <[email protected]>
 
         Internals.getElementByIdInShadowRoot is nonsense now.

Modified: trunk/Source/WebCore/WebCore.pri (136836 => 136837)


--- trunk/Source/WebCore/WebCore.pri	2012-12-06 13:55:54 UTC (rev 136836)
+++ trunk/Source/WebCore/WebCore.pri	2012-12-06 14:02:31 UTC (rev 136837)
@@ -107,20 +107,16 @@
 enable?(XSLT) {
     use?(LIBXML2) {
         mac {
-            INCLUDEPATH += /usr/include/libxml2
+            INCLUDEPATH += /usr/include/libxslt /usr/include/libxml2
             LIBS += -lxml2 -lxslt
         } else {
-            PKGCONFIG += libxslt
+            PKGCONFIG += libxslt libxml-2.0
         }
     } else {
         QT *= xmlpatterns
     }
 }
 
-use?(LIBXML2) {
-    PKGCONFIG += libxml-2.0
-}
-
 use?(ZLIB) {
     LIBS += -lz
 }

Modified: trunk/Tools/ChangeLog (136836 => 136837)


--- trunk/Tools/ChangeLog	2012-12-06 13:55:54 UTC (rev 136836)
+++ trunk/Tools/ChangeLog	2012-12-06 14:02:31 UTC (rev 136837)
@@ -1,3 +1,18 @@
+2012-12-06  Andras Becsi  <[email protected]>
+
+        [Qt][Mac] Fix libxslt and libxml2 config tests
+        https://bugs.webkit.org/show_bug.cgi?id=104164
+
+        Reviewed by Simon Hausmann.
+
+        We should not use pkg-config on Mac instead use direct include
+        paths and add needed libraries to the linker options to detect
+        libxslt and libxml2 provided by the system.
+        Previously we would always fall back to qtxmlpatterns.
+
+        * qmake/config.tests/libxml2/libxml2.pro:
+        * qmake/config.tests/libxslt/libxslt.pro:
+
 2012-12-06  Csaba Osztrogonác  <[email protected]>
 
         [Qt] Fix the build if the path contains "+" character

Modified: trunk/Tools/qmake/config.tests/libxml2/libxml2.pro (136836 => 136837)


--- trunk/Tools/qmake/config.tests/libxml2/libxml2.pro	2012-12-06 13:55:54 UTC (rev 136836)
+++ trunk/Tools/qmake/config.tests/libxml2/libxml2.pro	2012-12-06 14:02:31 UTC (rev 136837)
@@ -1,4 +1,9 @@
 CONFIG -= qt
 SOURCES = libxml2.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += libxml-2.0
+mac {
+    INCLUDEPATH += /usr/include/libxml2
+    LIBS += -lxml2
+} else {
+    PKGCONFIG += libxml-2.0
+    CONFIG += link_pkgconfig
+}

Modified: trunk/Tools/qmake/config.tests/libxslt/libxslt.pro (136836 => 136837)


--- trunk/Tools/qmake/config.tests/libxslt/libxslt.pro	2012-12-06 13:55:54 UTC (rev 136836)
+++ trunk/Tools/qmake/config.tests/libxslt/libxslt.pro	2012-12-06 14:02:31 UTC (rev 136837)
@@ -1,4 +1,9 @@
 CONFIG -= qt
 SOURCES = libxslt.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += libxslt
+mac {
+    INCLUDEPATH += /usr/include/libxslt /usr/include/libxml2
+    LIBS += -lxslt
+} else {
+    PKGCONFIG += libxslt
+    CONFIG += link_pkgconfig
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to