diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-02-14 11:11:59 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-02-15 13:55:43 +0100 |
commit | fe6268a256b83d07e711e08db66b2610fd2b4f8e (patch) | |
tree | 29055f9023cd2923fe5fe3d9afadbe1442c242d4 | |
parent | 83281ff6b918b05f0d12d11a0a031db30f7fb1a5 (diff) | |
download | meta-openembedded-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>
-rw-r--r-- | meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch | 28 | ||||
-rw-r--r-- | meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 2 |
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 000000000..6958b9e6a --- /dev/null +++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 079acc344dc12818d8b56bf80a42065d8429f7ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 14 Feb 2012 09:56:53 +0100 | ||
4 | Subject: [PATCH] JavaScriptCore: add EINA_LIBRARIES to shell build for Efl | ||
5 | |||
6 | * needed for libwtf_efl | ||
7 | * otherwise fails with ../wtf/libwtf_efl.so.0.1.0: error: undefined reference to 'eina_module_free' | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | Source/JavaScriptCore/shell/PlatformEfl.cmake | 1 + | ||
12 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
13 | |||
14 | diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake | ||
15 | index c35af2d..ef3f437 100644 | ||
16 | --- a/Source/JavaScriptCore/shell/PlatformEfl.cmake | ||
17 | +++ b/Source/JavaScriptCore/shell/PlatformEfl.cmake | ||
18 | @@ -1,6 +1,7 @@ | ||
19 | LIST(APPEND JSC_LIBRARIES | ||
20 | ${Glib_LIBRARIES} | ||
21 | ${ECORE_LIBRARIES} | ||
22 | + ${EINA_LIBRARIES} | ||
23 | ${CMAKE_DL_LIBS} | ||
24 | ) | ||
25 | |||
26 | -- | ||
27 | 1.7.8.4 | ||
28 | |||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb index 77aef024b..c0e346ce0 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 \ | |||
11 | 11 | ||
12 | SRCREV = "105069" | 12 | SRCREV = "105069" |
13 | PV = "1.7.3+svnr${SRCPV}" | 13 | PV = "1.7.3+svnr${SRCPV}" |
14 | PR = "r1" | ||
14 | 15 | ||
15 | SRCREV_FORMAT = "source" | 16 | SRCREV_FORMAT = "source" |
16 | 17 | ||
@@ -18,6 +19,7 @@ SRC_URI = "\ | |||
18 | svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;proto=http;subdir=src \ | 19 | svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;proto=http;subdir=src \ |
19 | svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http;subdir=src \ | 20 | svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http;subdir=src \ |
20 | svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http;subdir=src \ | 21 | svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http;subdir=src \ |
22 | file://0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch \ | ||
21 | file://CMakeLists.txt \ | 23 | file://CMakeLists.txt \ |
22 | " | 24 | " |
23 | 25 | ||