diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-07-29 14:37:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-31 13:50:46 +0100 |
commit | 03f2db73ad27b258d0be8b09a20fd595bdda6fee (patch) | |
tree | 2bc8ea0d8f6a093cfab364f1a4c21f632135e63c /meta | |
parent | dffe00c623ace593ae6f4da5a85aa336e7c4b2e6 (diff) | |
download | poky-03f2db73ad27b258d0be8b09a20fd595bdda6fee.tar.gz |
webkitgtk: Reenable on mips
It builds using the generic C_LOOP code.
(From OE-Core rev: 4e601b7f5ca0270495f225987bb1376b1cfe31a1)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_3.32.3.bb | 3 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.24.2.bb | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.32.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.32.3.bb index d1c6af52ed..de1b6e2f84 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.32.3.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.32.3.bb | |||
@@ -16,8 +16,5 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} | |||
16 | SRC_URI[archive.md5sum] = "c4976507bf3de69f27a050ad09531f5a" | 16 | SRC_URI[archive.md5sum] = "c4976507bf3de69f27a050ad09531f5a" |
17 | SRC_URI[archive.sha256sum] = "3ccb6859a43b839b714aa425cb185056f1e8604adbaab6a1bc179d1ba641a33f" | 17 | SRC_URI[archive.sha256sum] = "3ccb6859a43b839b714aa425cb185056f1e8604adbaab6a1bc179d1ba641a33f" |
18 | 18 | ||
19 | # webkitgtk doesn't work with tune 'mips' | ||
20 | COMPATIBLE_HOST_mipsarch = "${@bb.utils.contains('DEFAULTTUNE', 'mips', 'null', 'mips.*-linux', d)}" | ||
21 | |||
22 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" | 19 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" |
23 | RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" | 20 | RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" |
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.2.bb index 891266b220..7f01c4e26d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.24.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.24.2.bb | |||
@@ -43,8 +43,6 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ | |||
43 | gettext-native glib-2.0 glib-2.0-native libtasn1 \ | 43 | gettext-native glib-2.0 glib-2.0-native libtasn1 \ |
44 | " | 44 | " |
45 | 45 | ||
46 | COMPATIBLE_HOST_mipsarch = "${@bb.utils.contains('DEFAULTTUNE', 'mips', 'null', 'mips.*-linux', d)}" | ||
47 | |||
48 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ | 46 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ |
49 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ | 47 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ |
50 | enchant \ | 48 | enchant \ |
@@ -97,7 +95,7 @@ EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " | |||
97 | EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " | 95 | EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " |
98 | 96 | ||
99 | # JIT not supported on MIPS either | 97 | # JIT not supported on MIPS either |
100 | EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " | 98 | EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " |
101 | 99 | ||
102 | # JIT not supported on X32 | 100 | # JIT not supported on X32 |
103 | # An attempt was made to upstream JIT support for x32 in | 101 | # An attempt was made to upstream JIT support for x32 in |