aboutsummaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-02-14 11:11:59 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-02-15 13:55:43 +0100
commitfe6268a256b83d07e711e08db66b2610fd2b4f8e (patch)
tree29055f9023cd2923fe5fe3d9afadbe1442c242d4 /meta-efl
parent83281ff6b918b05f0d12d11a0a031db30f7fb1a5 (diff)
downloadmeta-openembedded-contrib-fe6268a256b83d07e711e08db66b2610fd2b4f8e.tar.gz
webkit-efl: resolve build error with missing eina lib when linked by gold
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch28
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_svn.bb2
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch
new file mode 100644
index 0000000000..6958b9e6a8
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch
@@ -0,0 +1,28 @@
+From 079acc344dc12818d8b56bf80a42065d8429f7ef Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 14 Feb 2012 09:56:53 +0100
+Subject: [PATCH] JavaScriptCore: add EINA_LIBRARIES to shell build for Efl
+
+* needed for libwtf_efl
+* otherwise fails with ../wtf/libwtf_efl.so.0.1.0: error: undefined reference to 'eina_module_free'
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Source/JavaScriptCore/shell/PlatformEfl.cmake | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake
+index c35af2d..ef3f437 100644
+--- a/Source/JavaScriptCore/shell/PlatformEfl.cmake
++++ b/Source/JavaScriptCore/shell/PlatformEfl.cmake
+@@ -1,6 +1,7 @@
+ LIST(APPEND JSC_LIBRARIES
+ ${Glib_LIBRARIES}
+ ${ECORE_LIBRARIES}
++ ${EINA_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ )
+
+--
+1.7.8.4
+
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 77aef024bf..c0e346ce0e 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -11,6 +11,7 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
SRCREV = "105069"
PV = "1.7.3+svnr${SRCPV}"
+PR = "r1"
SRCREV_FORMAT = "source"
@@ -18,6 +19,7 @@ SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;proto=http;subdir=src \
svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http;subdir=src \
svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http;subdir=src \
+ file://0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch \
file://CMakeLists.txt \
"