[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:19:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cfd5bfed3c0eee8d7f51ead2590dddc39624ffc0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 18:57:19 2010 +0000
2010-10-06 Rafael Antognolli <antognolli at profusion.mobi>
Unreviewed build fix.
[EFL] Build fix for glib support.
https://bugs.webkit.org/show_bug.cgi?id=47221
If compiling with GLib support enabled, we also need to link wtf against
glib library.
* wtf/CMakeListsEfl.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69218 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 688c7ce..668e47c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-06 Rafael Antognolli <antognolli at profusion.mobi>
+
+ Unreviewed build fix.
+
+ [EFL] Build fix for glib support.
+ https://bugs.webkit.org/show_bug.cgi?id=47221
+
+ If compiling with GLib support enabled, we also need to link wtf against
+ glib library.
+
+ * wtf/CMakeListsEfl.txt:
+
2010-10-05 Kwang Yul Seo <skyul at company100.net>
Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/wtf/CMakeListsEfl.txt b/JavaScriptCore/wtf/CMakeListsEfl.txt
index a537d0f..e5d8bd7 100644
--- a/JavaScriptCore/wtf/CMakeListsEfl.txt
+++ b/JavaScriptCore/wtf/CMakeListsEfl.txt
@@ -22,7 +22,12 @@ IF (ENABLE_GLIB_SUPPORT)
)
LIST(APPEND WTF_INCLUDE_DIRECTORIES
- ${JAVASCRIPTCORE_DIR}/wtf/gobject
+ ${Glib_INCLUDE_DIRS}
+ ${JAVASCRIPTCORE_DIR}/wtf/gobject
+ )
+
+ LIST(APPEND WTF_LIBRARIES
+ ${Glib_LIBRARIES}
)
ENDIF ()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list