diff options
Diffstat (limited to 'package/webkitgtk24')
| -rw-r--r-- | package/webkitgtk24/0002-WTF-Platform.h-use-_ABI64-instead-of-_MIPS_SIM_ABI64.patch | 46 | ||||
| -rw-r--r-- | package/webkitgtk24/Config.in | 11 |
2 files changed, 49 insertions, 8 deletions
diff --git a/package/webkitgtk24/0002-WTF-Platform.h-use-_ABI64-instead-of-_MIPS_SIM_ABI64.patch b/package/webkitgtk24/0002-WTF-Platform.h-use-_ABI64-instead-of-_MIPS_SIM_ABI64.patch new file mode 100644 index 0000000000..d56dc58161 --- /dev/null +++ b/package/webkitgtk24/0002-WTF-Platform.h-use-_ABI64-instead-of-_MIPS_SIM_ABI64.patch @@ -0,0 +1,46 @@ +[WTF] Platform.h: use _ABI64 instead of _MIPS_SIM_ABI64 to determine MIPS N64 + +Patch backported from upstream: + +http://trac.webkit.org/changeset/185863 + +I tweaked this patch to remove the Changelog part in order to make it +apply in Buildroot. + +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> + +From 2c84c8d1c294037141473c10e0374df63a3cdea9 Mon Sep 17 00:00:00 2001 +From: ossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Tue, 23 Jun 2015 06:33:16 +0000 +Subject: [PATCH] [WTF] Platform.h: use _ABI64 instead of _MIPS_SIM_ABI64 to determine MIPS N64 + https://bugs.webkit.org/show_bug.cgi?id=145113 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch by YunQiang Su <wzssyqa@gmail.com> on 2015-06-22 +Reviewed by Csaba Osztrogonác. + +* wtf/Platform.h: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@185863 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WTF/wtf/Platform.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index c234f50..b5e9859 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -82,7 +82,7 @@ + + /* CPU(MIPS) - MIPS 32-bit and 64-bit */ + #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) || defined(__mips64)) +-#if defined(_MIPS_SIM_ABI64) && (_MIPS_SIM == _MIPS_SIM_ABI64) ++#if defined(_ABI64) && (_MIPS_SIM == _ABI64) + #define WTF_CPU_MIPS64 1 + #define WTF_MIPS_ARCH __mips64 + #else +-- +1.7.1 + diff --git a/package/webkitgtk24/Config.in b/package/webkitgtk24/Config.in index d8c5e93ded..0a30bac7ac 100644 --- a/package/webkitgtk24/Config.in +++ b/package/webkitgtk24/Config.in @@ -2,25 +2,19 @@ config BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS bool # ARM needs BLX, so v5t+, BE completely untested so disabled default y if BR2_arm && !BR2_ARM_CPU_ARMV4 - # i386 / x86_64 external toolchains have issues and old gcc versions - # https://bugs.webkit.org/show_bug.cgi?id=132231 - # https://stackoverflow.com/questions/9140019/yield-is-not-a-member-of-stdthis-thread default y if BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109 # Disabled on MIPS big endian due to sigbus default y if BR2_mipsel || BR2_mips64el # Disabled on PowerPC pending runtime testing # Disabled on SuperH because of segfault depends on BR2_USE_MMU # libglib2 -comment "webkitgtk24 needs libgtk2 and a toolchain w/ C++, wchar, NPTL" +comment "webkitgtk24 needs libgtk2 and a toolchain w/ C++, wchar, NPTL, gcc >=4.8" depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS depends on BR2_ARCH_HAS_ATOMICS depends on !BR2_PACKAGE_LIBGTK2 || !BR2_PACKAGE_XORG7 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR + || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_USE_MMU config BR2_PACKAGE_WEBKITGTK24 @@ -28,6 +22,7 @@ config BR2_PACKAGE_WEBKITGTK24 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on (BR2_PACKAGE_LIBGTK2 && BR2_PACKAGE_XORG7) depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS depends on BR2_ARCH_HAS_ATOMICS |
