From d3f629e7dc1643c16cbd487212c0afa387a4b847 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 29 Dec 2017 10:00:12 +0800 Subject: webkitgtk: fix build with musl and x32 Make the x32 check generic to make it work with musl as well. Fixes [YOCTO #12118] (From OE-Core rev: dbd604ccf34e304769937b15051c047561de47f7) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.18.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb index 00b5a15e08..4938f69b7b 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb @@ -66,6 +66,7 @@ EXTRA_OECMAKE = " \ # GL/GLES header clash: both define the same thing, differently, on 32 bit x86 EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF " +EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF " # Javascript JIT is not supported on powerpc EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " @@ -92,7 +93,7 @@ EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " # An attempt was made to upstream JIT support for x32 in # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as # unresolved due to limited X32 adoption. -EXTRA_OECMAKE_append_linux-gnux32 = " -DENABLE_JIT=OFF" +EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " SECURITY_CFLAGS_remove_aarch64 = "-fpie" SECURITY_CFLAGS_append_aarch64 = " -fPIE" -- cgit v1.2.3-54-g00ecf