diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2017-12-29 10:00:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-04 12:57:42 +0000 |
commit | d3f629e7dc1643c16cbd487212c0afa387a4b847 (patch) | |
tree | 9b03e9ef8caaf99eaa0c5984572e056efa71f2f5 | |
parent | b58354d8f51a50053318683c55826a90d505847d (diff) | |
download | poky-d3f629e7dc1643c16cbd487212c0afa387a4b847.tar.gz |
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 <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.18.3.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 = " \ | |||
66 | 66 | ||
67 | # GL/GLES header clash: both define the same thing, differently, on 32 bit x86 | 67 | # GL/GLES header clash: both define the same thing, differently, on 32 bit x86 |
68 | EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF " | 68 | EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF " |
69 | EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF " | ||
69 | 70 | ||
70 | # Javascript JIT is not supported on powerpc | 71 | # Javascript JIT is not supported on powerpc |
71 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " | 72 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " |
@@ -92,7 +93,7 @@ EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " | |||
92 | # An attempt was made to upstream JIT support for x32 in | 93 | # An attempt was made to upstream JIT support for x32 in |
93 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as | 94 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as |
94 | # unresolved due to limited X32 adoption. | 95 | # unresolved due to limited X32 adoption. |
95 | EXTRA_OECMAKE_append_linux-gnux32 = " -DENABLE_JIT=OFF" | 96 | EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " |
96 | 97 | ||
97 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" | 98 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" |
98 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" | 99 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" |