diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-18 00:56:55 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-18 16:04:30 +0200 |
commit | 2f837d52d3956e83389842b0e06b1f02ff5c8a77 (patch) | |
tree | 41349c3e231fb2c35a661c21eba212ccada6dd62 /meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | |
parent | 359a5968f27008d6fcbaee5137c237bfcabd2579 (diff) | |
download | meta-openembedded-contrib-2f837d52d3956e83389842b0e06b1f02ff5c8a77.tar.gz |
webkit-efl: upgrade to 1.6.1
* revert.r78057.patch is not needed, because context menus were removed from eve in r59455
* we still need to force ARM mode, only the segfault is different:
| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/heap/Handle.h:126:79: instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here
| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
| {standard input}: Assembler messages:
| {standard input}:1116: Error: invalid immediate: 983040 is out of range
| {standard input}:1116: Error: value of 983040 too large for field of 2 bytes at 28
| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <http://gcc.gnu.org/bugs.html> for instructions.
| make[2]: *** [JavaScriptCore/CMakeFiles/javascriptcore_efl.dir/jit/JIT.cpp.o] Error 4
| make[2]: *** Waiting for unfinished jobs....
| {standard input}: Assembler messages:
| {standard input}:2059: Error: invalid immediate: 983040 is out of range
| {standard input}:2059: Error: value of 983040 too large for field of 2 bytes at 28
| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <http://gcc.gnu.org/bugs.html> for instructions.
| make[2]: *** [JavaScriptCore/CMakeFiles/javascriptcore_efl.dir/jit/JITOpcodes32_64.cpp.o] Error 4
| make[2]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source'
| make[1]: *** [JavaScriptCore/CMakeFiles/javascriptcore_efl.dir/all] Error 2
| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl/webkit/webkit-efl_svn.bb')
-rw-r--r-- | meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb index bffded788e..9f02a595e7 100644 --- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb +++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb @@ -9,27 +9,20 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \ libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \ libxml2 pango eina ecore evas edje" -SRCREV = "79192" -PV = "1.3.11+svnr${SRCPV}" +SRCREV = "97724" +PV = "1.6.1+svnr${SRCPV}" SRCREV_FORMAT = "source" 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=Tools;proto=http;subdir=src \ - file://revert.r78057.patch \ " S = "${WORKDIR}/src/Source" inherit cmake lib_package pkgconfig perlnative -# Wants to jump too far for THUMB on armv4t -# in WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)': -# DocTypeStrings.cpp:(.text._ZN7WebCore18DocTypeStringsHash21doctype_hash_functionEPKcj[WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)]+0x12): relocation truncated to fit: R_ARM_THM_CALL against symbol `__gnu_thumb1_case_uhi' defined in .text section in x86_64-linux/usr/armv4t/lib/gcc/arm-oe-linux-gnueabi/4.5.2/libgcc.a(_thumb1_case_uhi.o) -# the same in WebCore::CSSValueKeywordsHash::value_hash_function(char const*, unsigned int)': -# WebCore::CSSPropertyNamesHash::propery_hash_function(char const*, unsigned int)': -# WebCore::ColorDataHash::colordata_hash_function(char const*, unsigned int)': ARM_INSTRUCTION_SET = "arm" EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON" |