From d4cfb761016fe3873cbaeae1802148f075a6dd96 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 14 Feb 2012 11:11:59 +0100 Subject: [PATCH] webkit-efl: resolve build error with missing eina lib when linked by gold (From meta-openembedded rev: fe6268a256b83d07e711e08db66b2610fd2b4f8e) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- ...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(+) create mode 100644 meta-openembedded/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch diff --git a/meta-openembedded/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch b/meta-openembedded/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-openembedded/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 +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 +--- + 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-openembedded/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-openembedded/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb index 77aef02..c0e346c 100644 --- a/meta-openembedded/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb +++ b/meta-openembedded/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 \ " -- 2.7.4