Patchwork [meta-oe,meta-efl,1/2] webkit-efl: resolve build error with missing eina lib when linked by gold

login
register
mail settings
Submitter Martin Jansa
Date Feb. 15, 2012, 12:59 p.m.
Message ID <fe6268a256b83d07e711e08db66b2610fd2b4f8e.1329310622.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/21281/
State Accepted
Commit fe6268a256b83d07e711e08db66b2610fd2b4f8e
Headers show

Comments

Martin Jansa - Feb. 15, 2012, 12:59 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...ore-add-EINA_LIBRARIES-to-shell-build-for.patch |   28 ++++++++++++++++++++
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |    2 +
 2 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch

Patch

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 0000000..6958b9e
--- /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 77aef02..c0e346c 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 \
 "