From 03f2db73ad27b258d0be8b09a20fd595bdda6fee Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 29 Jul 2019 14:37:19 +0300 Subject: webkitgtk: Reenable on mips It builds using the generic C_LOOP code. (From OE-Core rev: 4e601b7f5ca0270495f225987bb1376b1cfe31a1) Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-gnome/epiphany/epiphany_3.32.3.bb | 3 --- meta/recipes-sato/webkit/webkitgtk_2.24.2.bb | 4 +--- 2 files changed, 1 insertion(+), 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} SRC_URI[archive.md5sum] = "c4976507bf3de69f27a050ad09531f5a" SRC_URI[archive.sha256sum] = "3ccb6859a43b839b714aa425cb185056f1e8604adbaab6a1bc179d1ba641a33f" -# webkitgtk doesn't work with tune 'mips' -COMPATIBLE_HOST_mipsarch = "${@bb.utils.contains('DEFAULTTUNE', 'mips', 'null', 'mips.*-linux', d)}" - FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" 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 \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -COMPATIBLE_HOST_mipsarch = "${@bb.utils.contains('DEFAULTTUNE', 'mips', 'null', 'mips.*-linux', d)}" - PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ @@ -97,7 +95,7 @@ EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " # JIT not supported on MIPS either -EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " # JIT not supported on X32 # An attempt was made to upstream JIT support for x32 in -- cgit 1.2.3-korg