summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-01-12 13:47:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-14 22:10:21 +0000
commit64ff1449d0396276a62cc6f03d0a2f2862833d7a (patch)
treeac59dffa3b6bc52d5ae53bc21e6de794fab6c71d /meta/recipes-sato/webkit
parentf9294b7ece5aab253e0b4ca7a46dd21937bb4dc5 (diff)
downloadpoky-64ff1449d0396276a62cc6f03d0a2f2862833d7a.tar.gz
webkitgtk: update to 2.18.5 (includes Spectre mitigations; see commit description)
This is the only available stable version with mitigation fixes for Spectre. Webkit upstream developers do not port CVE fixes to earlier stable series, no exception was made in this case. More information: https://webkit.org/blog/8048/what-spectre-and-meltdown-mean-for-webkit/ https://webkitgtk.org/security/WSA-2018-0001.html https://webkitgtk.org/2018/01/10/webkitgtk2.18.5-released.html This commit also contains the following commits added in master branch after pyro release: === webkitgtk: Upgrade to 2.16.1 Fix build with gcc7 Move all patches to webkit folder Drop patches that were backports or have been upstreamed (From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e) (From OE-Core rev: a70a8179eb8b8ebb6c9f9dc8fa6f26bb271b2954) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: remove native python dependency Using host python seems to be fine. (From OE-Core rev: 7cf80640f53bd8faa4874c2dad5f630a935475f6) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: Fix build for armv5 Detect atomics during configure (From OE-Core rev: 424ffbde2111130137e307eb9e598ad50451c865) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: Upgrade to 2.16.3 Use bfd linker on ppc, this is because gold fails to link webkit libraries when PIE is enabled (From OE-Core rev: 8808d4b13a946499bc6e84a1be15f53d8ab3f673) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: Upgrade to 2.16.5 Adjust some dependencies: libgcrypt is now required (instead of gnutls) and the following build deps where missing: gettext-native, glib-2.0 and glib-2.0-native. Also the CMake argument ENABLE_CREDENTIAL_STORAGE has been renamed to USE_LIBSECRET. This new upstream release (2.16.4 actually) includes security fixes for CVE: CVE-2017-2538 (From OE-Core rev: ef68005a8c527e9b1d05b7769f0ec8ebe9ec3f91) Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: update to 2.16.6 (From OE-Core rev: 198ccdbefa481f725492b5d8834213fe26431be5) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: Do not use -isystem forcibly this causes include_next <stdlib.h> to not find this header since -isystem <sysroot> is added via cmake, we alrady are using --sysroot so rely on that (From OE-Core rev: a0f2d1389a7e76b64003fea391a0cd485ff5fe77) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: Add a recommends on shared-mime-info. * without this package installed any WebKitGTK+ based browser will fail to correctly open html files (and other files) from disk (file:// URIs). It will open them as plain txt files. (From OE-Core rev: b708cb53b46d9d82a7853bcd0f25ef6bc417bd10) Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: disable gobject-introspection on armv7a Disable gobject-introspection on armv7a and armv7ve to avoid do_compile failure: | qemu: uncaught target signal 11 (Segmentation fault) - core dumped | Segmentation fault (From OE-Core rev: bdddd81c8b4eab6bbf7a8697992b48cb5a30ae4a) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> === webkitgtk: update to 2.18.3 gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no longer present in upstream tree. However, a patch with different musl fixes has been added. The rest of the patches are rebased to the new tree. Libtasn is a new dependency. Disable Gstreamer GL support on x86 due to clashing headers problem. (From OE-Core rev: 3acae2dcd130122fe76504ec855af78db829d6ec) === 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: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch185
-rw-r--r--meta/recipes-sato/webkit/files/musl-fixes.patch48
-rw-r--r--meta/recipes-sato/webkit/files/ppc-musl-fix.patch26
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch (renamed from meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch)0
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch77
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch (renamed from meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch)23
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch (renamed from meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch)0
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch (renamed from meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch)25
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch126
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch (renamed from meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch)24
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/cross-compile.patch (renamed from meta/recipes-sato/webkit/files/cross-compile.patch)0
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch (renamed from meta/recipes-sato/webkit/files/detect_atomics.patch)28
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/x32_support.patch13
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.18.5.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.14.5.bb)37
14 files changed, 287 insertions, 325 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
deleted file mode 100644
index a4face2765..0000000000
--- a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ /dev/null
@@ -1,185 +0,0 @@
1From 20ee11dd188e1538f8cdd17a289dc6f9c63a011e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 12:35:41 -0700
4Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
5
6gcc-6 has now introduced stdlib.h in libstdc++ for better
7compliance and its including the C library stdlib.h using
8include_next which is sensitive to order of system header
9include paths. Its infact better to not tinker with the
10system header include paths at all. Since adding /usr/include
11to -system is redundant and compiler knows about it moreover
12now with gcc6 it interferes with compiler's functioning
13and ends up with compile errors e.g.
14
15/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
16
17This is also an issue with clang (when using libstdc++ >= 6)
18
19Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=161697
20
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22Upstream-Status: Pending
23---
24 Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
25 Source/WebCore/PlatformGTK.cmake | 6 +++---
26 Source/WebKit2/PlatformGTK.cmake | 2 +-
27 Source/cmake/WebKitMacros.cmake | 2 +-
28 Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +-
29 Tools/ImageDiff/CMakeLists.txt | 2 +-
30 Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
31 Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
32 Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 2 +-
33 Tools/WebKitTestRunner/CMakeLists.txt | 2 +-
34 10 files changed, 12 insertions(+), 12 deletions(-)
35
36diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
37index 155c797..80fe22b 100644
38--- a/Source/JavaScriptCore/shell/CMakeLists.txt
39+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
40@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
41
42 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
43 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
44-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
45+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
46 add_executable(jsc ${JSC_SOURCES})
47 target_link_libraries(jsc ${JSC_LIBRARIES})
48
49diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
50index 567bd79..1fabea8 100644
51--- a/Source/WebCore/PlatformGTK.cmake
52+++ b/Source/WebCore/PlatformGTK.cmake
53@@ -340,7 +340,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
54 ${GTK2_INCLUDE_DIRS}
55 ${GDK2_INCLUDE_DIRS}
56 )
57- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
58+ target_include_directories(WebCorePlatformGTK2 PRIVATE
59 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
60 )
61 target_link_libraries(WebCorePlatformGTK2
62@@ -365,7 +365,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCorePlatformGTK)
63 target_include_directories(WebCorePlatformGTK PRIVATE
64 ${WebCore_INCLUDE_DIRECTORIES}
65 )
66-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
67+target_include_directories(WebCorePlatformGTK PRIVATE
68 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
69 ${GTK_INCLUDE_DIRS}
70 ${GDK_INCLUDE_DIRS}
71@@ -383,7 +383,7 @@ include_directories(
72 "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
73 )
74
75-include_directories(SYSTEM
76+include_directories(
77 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
78 )
79
80diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
81index e4805a4..c57df5d 100644
82--- a/Source/WebKit2/PlatformGTK.cmake
83+++ b/Source/WebKit2/PlatformGTK.cmake
84@@ -822,7 +822,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
85 target_include_directories(WebKitPluginProcess2 PRIVATE
86 ${WebKit2CommonIncludeDirectories}
87 )
88- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
89+ target_include_directories(WebKitPluginProcess2 PRIVATE
90 ${WebKit2CommonSystemIncludeDirectories}
91 ${GTK2_INCLUDE_DIRS}
92 ${GDK2_INCLUDE_DIRS}
93diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
94index 043e78e..8b3b642 100644
95--- a/Source/cmake/WebKitMacros.cmake
96+++ b/Source/cmake/WebKitMacros.cmake
97@@ -224,7 +224,7 @@ endmacro()
98
99 macro(WEBKIT_FRAMEWORK _target)
100 include_directories(${${_target}_INCLUDE_DIRECTORIES})
101- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
102+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
103 add_library(${_target} ${${_target}_LIBRARY_TYPE}
104 ${${_target}_HEADERS}
105 ${${_target}_SOURCES}
106diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
107index c431667..6dff244 100644
108--- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
109+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
110@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES
111 )
112
113 include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})
114-include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
115+include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
116
117 set(WebKitTestNetscapePlugin_LIBRARIES
118 ${X11_LIBRARIES}
119diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
120index b15443f..87e03bf 100644
121--- a/Tools/ImageDiff/CMakeLists.txt
122+++ b/Tools/ImageDiff/CMakeLists.txt
123@@ -14,6 +14,6 @@ set(IMAGE_DIFF_LIBRARIES
124 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
125
126 include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
127-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
128+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
129 add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
130 target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
131diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
132index 0704bc6..619e5a5 100644
133--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
134+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
135@@ -58,7 +58,7 @@ endif ()
136 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
137
138 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
139-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
140+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
141 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
142 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
143
144diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
145index 7552cc2..2eb44d5 100644
146--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
147+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
148@@ -20,7 +20,7 @@ include_directories(
149 ${WEBKIT2_DIR}/UIProcess/API/gtk
150 )
151
152-include_directories(SYSTEM
153+include_directories(
154 ${GDK3_INCLUDE_DIRS}
155 ${GLIB_INCLUDE_DIRS}
156 ${GTK3_INCLUDE_DIRS}
157diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
158index b0b4739..434e4ca 100644
159--- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
160+++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
161@@ -23,7 +23,7 @@ include_directories(
162 ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
163 )
164
165-include_directories(SYSTEM
166+include_directories(
167 ${ATSPI_INCLUDE_DIRS}
168 ${GLIB_INCLUDE_DIRS}
169 ${GSTREAMER_INCLUDE_DIRS}
170diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
171index 7db90f2..a4f917f 100644
172--- a/Tools/WebKitTestRunner/CMakeLists.txt
173+++ b/Tools/WebKitTestRunner/CMakeLists.txt
174@@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES
175 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
176
177 include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
178-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
179+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
180
181 add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
182 target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
183--
1842.9.3
185
diff --git a/meta/recipes-sato/webkit/files/musl-fixes.patch b/meta/recipes-sato/webkit/files/musl-fixes.patch
deleted file mode 100644
index 4fdd56fea0..0000000000
--- a/meta/recipes-sato/webkit/files/musl-fixes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Replace __GLIBC__ with __linux__ since musl also supports it
2so checking __linux__ is more accomodating
3
4See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
10===================================================================
11--- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
12+++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
13@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers:
14 #error Unknown Architecture
15 #endif
16
17-#elif defined(__GLIBC__) && ENABLE(JIT)
18+#elif defined(__linux__) && ENABLE(JIT)
19
20 #if CPU(X86)
21 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
22@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers:
23 #error Unknown Architecture
24 #endif
25
26-#elif defined(__GLIBC__)
27+#elif defined(__linux__) // glibc and musl
28
29 // The following sequence depends on glibc's sys/ucontext.h.
30 #if CPU(X86)
31@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers:
32 #error Unknown Architecture
33 #endif
34
35-#elif defined(__GLIBC__)
36+#elif defined(__linux__) // glibc and musl
37
38 // The following sequence depends on glibc's sys/ucontext.h.
39 #if CPU(X86)
40@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers:
41 #error Unknown Architecture
42 #endif
43
44-#elif defined(__GLIBC__)
45+#elif defined(__linux__) // glibc and musl
46
47 // The following sequence depends on glibc's sys/ucontext.h.
48 #if CPU(X86)
diff --git a/meta/recipes-sato/webkit/files/ppc-musl-fix.patch b/meta/recipes-sato/webkit/files/ppc-musl-fix.patch
deleted file mode 100644
index 5f58e4953e..0000000000
--- a/meta/recipes-sato/webkit/files/ppc-musl-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1ucontext structure is different between musl and glibc for ppc
2therefore its not enough just to check for arch alone, we also
3need to check for libc type.
4
5Fixes errors like
6
7Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
8 thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
9
10Upstream-Status: Pending
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
15===================================================================
16--- webkitgtk-2.12.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
17+++ webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
18@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendR
19 }
20
21 ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
22-#if CPU(PPC)
23+#if CPU(PPC) && defined(__GLIBC__)
24 thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
25 #else
26 thread->suspendedMachineContext = userContext->uc_mcontext;
diff --git a/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
index fae3b0b2e5..fae3b0b2e5 100644
--- a/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
new file mode 100644
index 0000000000..7cc4514fcc
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
@@ -0,0 +1,77 @@
1From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Oct 2017 17:00:08 +0300
4Subject: [PATCH] Fix build with musl
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
10 Source/WTF/wtf/Platform.h | 2 +-
11 2 files changed, 6 insertions(+), 6 deletions(-)
12
13diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
14index 95080b9..2bb689c 100644
15--- a/Source/JavaScriptCore/runtime/MachineContext.h
16+++ b/Source/JavaScriptCore/runtime/MachineContext.h
17@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
18 #error Unknown Architecture
19 #endif
20
21-#elif defined(__GLIBC__)
22+#elif defined(__linux__)
23
24 #if CPU(X86)
25 return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
26@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext)
27 #error Unknown Architecture
28 #endif
29
30-#elif defined(__GLIBC__)
31+#elif defined(__linux__)
32
33 // The following sequence depends on glibc's sys/ucontext.h.
34 #if CPU(X86)
35@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext)
36 #error Unknown Architecture
37 #endif
38
39-#elif defined(__GLIBC__)
40+#elif defined(__linux__)
41
42 // The following sequence depends on glibc's sys/ucontext.h.
43 #if CPU(X86)
44@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
45 #error Unknown Architecture
46 #endif
47
48-#elif defined(__GLIBC__)
49+#elif defined(__linux__)
50
51 // The following sequence depends on glibc's sys/ucontext.h.
52 #if CPU(X86)
53@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
54 #error Unknown Architecture
55 #endif
56
57-#elif defined(__GLIBC__)
58+#elif defined(__linux__)
59
60 // The following sequence depends on glibc's sys/ucontext.h.
61 #if CPU(X86)
62diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
63index 5a2863b..b36c3ff 100644
64--- a/Source/WTF/wtf/Platform.h
65+++ b/Source/WTF/wtf/Platform.h
66@@ -680,7 +680,7 @@
67 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
68 #endif
69
70-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
71+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
72 #define HAVE_MACHINE_CONTEXT 1
73 #endif
74
75--
762.14.1
77
diff --git a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
index 615fe4f402..896890b433 100644
--- a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -1,19 +1,20 @@
1From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 1From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Aug 2016 16:38:11 +0300 3Date: Mon, 29 Aug 2016 16:38:11 +0300
4Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir 4Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 Source/WebKit2/PlatformGTK.cmake | 9 +++++---- 10 Source/WebKit/PlatformGTK.cmake | 9 +++++----
10 1 file changed, 5 insertions(+), 4 deletions(-) 11 1 file changed, 5 insertions(+), 4 deletions(-)
11 12
12diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake 13diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
13index adaa010..f18cf8a 100644 14index a33c6a86..d83a2e77 100644
14--- a/Source/WebKit2/PlatformGTK.cmake 15--- a/Source/WebKit/PlatformGTK.cmake
15+++ b/Source/WebKit2/PlatformGTK.cmake 16+++ b/Source/WebKit/PlatformGTK.cmake
16@@ -906,8 +906,9 @@ endif () 17@@ -1122,8 +1122,9 @@ endif ()
17 string(REGEX MATCHALL "-L[^ ]*" 18 string(REGEX MATCHALL "-L[^ ]*"
18 INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") 19 INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
19 20
@@ -25,7 +26,7 @@ index adaa010..f18cf8a 100644
25 DEPENDS WebKit2 26 DEPENDS WebKit2
26 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 27 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
27 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= 28 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
28@@ -950,7 +951,7 @@ add_custom_command( 29@@ -1168,7 +1169,7 @@ add_custom_command(
29 add_custom_command( 30 add_custom_command(
30 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir 31 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
31 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 32 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -34,7 +35,7 @@ index adaa010..f18cf8a 100644
34 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} 35 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
35 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" 36 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
36 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 37 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
37@@ -1004,7 +1005,7 @@ add_custom_command( 38@@ -1225,7 +1226,7 @@ add_custom_command(
38 39
39 add_custom_command( 40 add_custom_command(
40 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib 41 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
@@ -44,5 +45,5 @@ index adaa010..f18cf8a 100644
44 ) 45 )
45 46
46-- 47--
472.9.3 482.14.1
48 49
diff --git a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
index 93a69c0292..93a69c0292 100644
--- a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
diff --git a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
index 586dd2375c..83fd5129a0 100644
--- a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
@@ -1,8 +1,8 @@
1From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 1From 9b09974003097c9a408bbeea568996768efe705b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 11 Aug 2016 17:13:51 +0300 3Date: Thu, 11 Aug 2016 17:13:51 +0300
4Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under 4Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works
5 OpenEmbedded build system 5 under OpenEmbedded build system
6 6
7This requires setting a few environment variables so that the transient 7This requires setting a few environment variables so that the transient
8binary is build and linked correctly, and disabling the tweaks to RUN 8binary is build and linked correctly, and disabling the tweaks to RUN
@@ -10,26 +10,27 @@ variable from gtkdoc.py script so that our qemu wrapper is taken into use.
10 10
11Upstream-Status: Inappropriate [oe-specific] 11Upstream-Status: Inappropriate [oe-specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13
13--- 14---
14 Source/PlatformGTK.cmake | 2 +- 15 Source/PlatformGTK.cmake | 2 +-
15 Tools/gtk/gtkdoc.py | 4 ++-- 16 Tools/gtk/gtkdoc.py | 4 ++--
16 2 files changed, 3 insertions(+), 3 deletions(-) 17 2 files changed, 3 insertions(+), 3 deletions(-)
17 18
18diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake 19diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
19index af4d2e3..b7b93c7 100644 20index 50b5393..7a31db5 100644
20--- a/Source/PlatformGTK.cmake 21--- a/Source/PlatformGTK.cmake
21+++ b/Source/PlatformGTK.cmake 22+++ b/Source/PlatformGTK.cmake
22@@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) 23@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
23 add_custom_command( 24 add_custom_command(
24 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" 25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
25 DEPENDS ${DocumentationDependencies} 26 DEPENDS ${DocumentationDependencies}
26- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} 27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
27+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} 28+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc -v ${_extra_args}
28 COMMAND touch ${_stamp_name} 29 COMMAND touch ${_stamp_name}
29 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" 30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
30 ) 31 VERBATIM
31diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py 32diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
32index 4c8237b..c0205f0 100644 33index 03c8e8e..34fbaff 100644
33--- a/Tools/gtk/gtkdoc.py 34--- a/Tools/gtk/gtkdoc.py
34+++ b/Tools/gtk/gtkdoc.py 35+++ b/Tools/gtk/gtkdoc.py
35@@ -318,9 +318,9 @@ class GTKDoc(object): 36@@ -318,9 +318,9 @@ class GTKDoc(object):
@@ -38,12 +39,12 @@ index 4c8237b..c0205f0 100644
38 current_ld_library_path = env.get('LD_LIBRARY_PATH') 39 current_ld_library_path = env.get('LD_LIBRARY_PATH')
39- if current_ld_library_path: 40- if current_ld_library_path:
40+ if current_ld_library_path and 'RUN' not in env: 41+ if current_ld_library_path and 'RUN' not in env:
41 env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) 42 env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
42- else: 43- else:
43+ elif 'RUN' not in env: 44+ elif 'RUN' not in env:
44 env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path 45 env['LD_LIBRARY_PATH'] = self.library_path
45 46
46 if ldflags: 47 if ldflags:
47-- 48--
482.8.1 492.15.1
49 50
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
new file mode 100644
index 0000000000..dfdc116018
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -0,0 +1,126 @@
1From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 12:35:41 -0700
4Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem
5
6gcc-6 has now introduced stdlib.h in libstdc++ for better
7compliance and its including the C library stdlib.h using
8include_next which is sensitive to order of system header
9include paths. Its infact better to not tinker with the
10system header include paths at all. Since adding /usr/include
11to -system is redundant and compiler knows about it moreover
12now with gcc6 it interferes with compiler's functioning
13and ends up with compile errors e.g.
14
15/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
16
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18
19---
20 Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
21 Source/WebCore/PlatformGTK.cmake | 6 +++---
22 Source/WebKit/PlatformGTK.cmake | 2 +-
23 Source/cmake/WebKitMacros.cmake | 2 +-
24 Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
25 Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
26 6 files changed, 8 insertions(+), 8 deletions(-)
27
28diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
29index bc37dd31..4e49871f 100644
30--- a/Source/JavaScriptCore/shell/CMakeLists.txt
31+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
32@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
33 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
34 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
35 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
36-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
37+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
38 add_executable(jsc ${JSC_SOURCES})
39 target_link_libraries(jsc ${JSC_LIBRARIES})
40
41diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
42index 73506c74..8eb8b415 100644
43--- a/Source/WebCore/PlatformGTK.cmake
44+++ b/Source/WebCore/PlatformGTK.cmake
45@@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
46 ${GTK2_INCLUDE_DIRS}
47 ${GDK2_INCLUDE_DIRS}
48 )
49- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
50+ target_include_directories(WebCorePlatformGTK2 PRIVATE
51 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
52 )
53 target_link_libraries(WebCorePlatformGTK2
54@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
55 target_include_directories(WebCorePlatformGTK PRIVATE
56 ${WebCore_INCLUDE_DIRECTORIES}
57 )
58-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
59+target_include_directories(WebCorePlatformGTK PRIVATE
60 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
61 ${GTK_INCLUDE_DIRS}
62 ${GDK_INCLUDE_DIRS}
63@@ -321,7 +321,7 @@ include_directories(
64 "${WEBCORE_DIR}/bindings/gobject/"
65 )
66
67-include_directories(SYSTEM
68+include_directories(
69 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
70 )
71
72diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
73index d83a2e77..401246f4 100644
74--- a/Source/WebKit/PlatformGTK.cmake
75+++ b/Source/WebKit/PlatformGTK.cmake
76@@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
77 target_include_directories(WebKitPluginProcess2 PRIVATE
78 ${WebKit2CommonIncludeDirectories}
79 )
80- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
81+ target_include_directories(WebKitPluginProcess2 PRIVATE
82 ${WebKit2CommonSystemIncludeDirectories}
83 ${GTK2_INCLUDE_DIRS}
84 ${GDK2_INCLUDE_DIRS}
85diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
86index 7bc89543..d9818fa4 100644
87--- a/Source/cmake/WebKitMacros.cmake
88+++ b/Source/cmake/WebKitMacros.cmake
89@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target)
90 endmacro()
91
92 macro(WEBKIT_FRAMEWORK _target)
93- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
94+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
95 target_sources(${_target} PRIVATE
96 ${${_target}_HEADERS}
97 ${${_target}_SOURCES}
98diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
99index e832a86d..ce92c864 100644
100--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
101+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
102@@ -57,7 +57,7 @@ endif ()
103 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
104
105 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
106-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
107+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
108 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
109 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
110
111diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
112index 1be3dd52..7bdddf37 100644
113--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
114+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
115@@ -20,7 +20,7 @@ include_directories(
116 ${WEBKIT2_DIR}/UIProcess/API/gtk
117 )
118
119-include_directories(SYSTEM
120+include_directories(
121 ${GDK3_INCLUDE_DIRS}
122 ${GLIB_INCLUDE_DIRS}
123 ${GTK3_INCLUDE_DIRS}
124--
1252.14.1
126
diff --git a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
index 3f71297f50..fb4c4dc932 100644
--- a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
@@ -1,23 +1,24 @@
1From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001 1From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 28 Oct 2015 14:18:57 +0200 3Date: Wed, 28 Oct 2015 14:18:57 +0200
4Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the 4Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to
5 compiler flags. 5 the compiler flags.
6 6
7g-ir-compiler is using a C compiler internally, so it needs to set 7g-ir-compiler is using a C compiler internally, so it needs to set
8the proper flags for it. 8the proper flags for it.
9 9
10Upstream-Status: Pending [review on oe-core list] 10Upstream-Status: Pending [review on oe-core list]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
12--- 13---
13 Source/WebKit2/PlatformGTK.cmake | 4 ++-- 14 Source/WebKit/PlatformGTK.cmake | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
15 16
16Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake 17diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
17=================================================================== 18index 7f92ae72..a33c6a86 100644
18--- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake 19--- a/Source/WebKit/PlatformGTK.cmake
19+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake 20+++ b/Source/WebKit/PlatformGTK.cmake
20@@ -910,7 +910,7 @@ add_custom_command( 21@@ -1126,7 +1126,7 @@ add_custom_command(
21 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 22 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
22 DEPENDS WebKit2 23 DEPENDS WebKit2
23 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 24 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -26,7 +27,7 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
26 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 27 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
27 ${INTROSPECTION_SCANNER} 28 ${INTROSPECTION_SCANNER}
28 --quiet 29 --quiet
29@@ -951,7 +951,7 @@ add_custom_command( 30@@ -1169,7 +1169,7 @@ add_custom_command(
30 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir 31 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
31 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 32 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
32 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 33 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -35,3 +36,6 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
35 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" 36 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
36 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 37 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
37 ${INTROSPECTION_SCANNER} 38 ${INTROSPECTION_SCANNER}
39--
402.14.1
41
diff --git a/meta/recipes-sato/webkit/files/cross-compile.patch b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
index 4d1de72851..4d1de72851 100644
--- a/meta/recipes-sato/webkit/files/cross-compile.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
diff --git a/meta/recipes-sato/webkit/files/detect_atomics.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
index c4e80a7d96..c6157e1037 100644
--- a/meta/recipes-sato/webkit/files/detect_atomics.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
@@ -1,26 +1,31 @@
1Sourced from https://bugs.webkit.org/show_bug.cgi?id=161900 1From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 17 May 2017 22:34:24 -0700
4Subject: [PATCH 8/9] webkitgtk: Fix build for armv5
2 5
3on arm fixes 6Taken from
4 7https://bugs.webkit.org/show_bug.cgi?id=161900
5| /usr/src/debug/libgcc/6.2.0-r0/gcc-6.2.0/build.arm-oe-linux-gnueabi.arm-oe-linux-gnueabi/libgcc/../../../../../../../work-shared/gcc-6.2.0-r0/gcc-6.2.0/libgcc/config/arm/linux-atomic-64bit.c:117: multiple definition of `__sync_sub_and_fetch_8'
6 8
9Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
8 11
9Upstream-Status: Backport 12---
13 Source/WTF/wtf/CMakeLists.txt | 10 +++++++++-
14 1 file changed, 9 insertions(+), 1 deletion(-)
10 15
11diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt 16diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
12index 867999e..ea69322 100644 17index 6b5e45b9..46ee3c22 100644
13--- a/Source/WTF/wtf/CMakeLists.txt 18--- a/Source/WTF/wtf/CMakeLists.txt
14+++ b/Source/WTF/wtf/CMakeLists.txt 19+++ b/Source/WTF/wtf/CMakeLists.txt
15@@ -171,7 +171,6 @@ set(WTF_HEADERS 20@@ -205,7 +205,6 @@ set(WTF_HEADERS
16 21
17 set(WTF_SOURCES 22 set(WTF_SOURCES
18 Assertions.cpp 23 Assertions.cpp
19- Atomics.cpp 24- Atomics.cpp
25 AutomaticThread.cpp
20 BitVector.cpp 26 BitVector.cpp
21 CompilationThread.cpp 27 CPUTime.cpp
22 CrossThreadCopier.cpp 28@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC)
23@@ -276,6 +275,15 @@ if (NOT USE_SYSTEM_MALLOC)
24 list(APPEND WTF_LIBRARIES bmalloc) 29 list(APPEND WTF_LIBRARIES bmalloc)
25 endif () 30 endif ()
26 31
@@ -36,3 +41,6 @@ index 867999e..ea69322 100644
36 list(APPEND WTF_SOURCES 41 list(APPEND WTF_SOURCES
37 unicode/icu/CollatorICU.cpp 42 unicode/icu/CollatorICU.cpp
38 ) 43 )
44--
452.14.1
46
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
index fea4c27147..5f23837585 100644
--- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
@@ -3,11 +3,11 @@ Subject: Fix FTBFS in x32
3Bug-Debian: https://bugs.debian.org/700795 3Bug-Debian: https://bugs.debian.org/700795
4Upstream-Status: Pending 4Upstream-Status: Pending
5Signed-off-by: Christopher Larson <chris_larson@mentor.com> 5Signed-off-by: Christopher Larson <chris_larson@mentor.com>
6Index: webkitgtk/Source/WTF/wtf/Platform.h 6Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
7=================================================================== 7===================================================================
8--- webkitgtk.orig/Source/WTF/wtf/Platform.h 8--- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h
9+++ webkitgtk/Source/WTF/wtf/Platform.h 9+++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
10@@ -182,8 +182,12 @@ 10@@ -172,7 +172,11 @@
11 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ 11 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
12 #if defined(__x86_64__) \ 12 #if defined(__x86_64__) \
13 || defined(_M_X64) 13 || defined(_M_X64)
@@ -15,8 +15,7 @@ Index: webkitgtk/Source/WTF/wtf/Platform.h
15+#define WTF_CPU_X86_64_32 1 15+#define WTF_CPU_X86_64_32 1
16+#else 16+#else
17 #define WTF_CPU_X86_64 1 17 #define WTF_CPU_X86_64 1
18 #endif
19+#endif 18+#endif
19 #define WTF_CPU_X86_SSE2 1
20 #endif
20 21
21 /* CPU(ARM64) - Apple */
22 #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb
index daa17a94da..a64aee22e6 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb
@@ -13,35 +13,29 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
13 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ 13 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
14 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ 14 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
15 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ 15 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
16 file://musl-fixes.patch \
17 file://ppc-musl-fix.patch \
18 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ 16 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
19 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ 17 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
20 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
21 file://detect_atomics.patch \
22 file://x32_support.patch \ 18 file://x32_support.patch \
23 file://cross-compile.patch \ 19 file://cross-compile.patch \
20 file://detect-atomics-during-configure.patch \
21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
22 file://0001-Fix-build-with-musl.patch \
24 " 23 "
25 24
26SRC_URI[md5sum] = "7fe3cb2699e64f969b285823c5ae2516" 25SRC_URI[md5sum] = "af18c2cfa00cadfd0b4d8db21cab011d"
27SRC_URI[sha256sum] = "3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f" 26SRC_URI[sha256sum] = "0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8"
28 27
29inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 28inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
30 29
31# We cannot inherit pythonnative because that would conflict with inheriting python3native
32# (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary
33# so we simply set it explicitly here.
34EXTRANATIVEPATH += "python-native"
35
36# depends on libxt 30# depends on libxt
37REQUIRED_DISTRO_FEATURES = "x11" 31REQUIRED_DISTRO_FEATURES = "x11"
38 32
39DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ 33DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
40 gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ 34 gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
41 pango icu bison-native gawk intltool-native libwebp \ 35 pango icu bison-native gawk intltool-native libwebp \
42 atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ 36 atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \
43 ruby-native libnotify gstreamer1.0-plugins-bad \ 37 ruby-native libnotify gstreamer1.0-plugins-bad \
44 python-native \ 38 gettext-native glib-2.0 glib-2.0-native libtasn1 \
45 " 39 "
46 40
47PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ 41PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
@@ -58,7 +52,7 @@ PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_G
58PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" 52PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
59PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" 53PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
60PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" 54PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
61PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret" 55PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret"
62PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" 56PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
63 57
64EXTRA_OECMAKE = " \ 58EXTRA_OECMAKE = " \
@@ -67,8 +61,13 @@ EXTRA_OECMAKE = " \
67 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ 61 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
68 ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ 62 ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \
69 -DENABLE_MINIBROWSER=ON \ 63 -DENABLE_MINIBROWSER=ON \
64 -DPYTHON_EXECUTABLE=`which python` \
70 " 65 "
71 66
67# GL/GLES header clash: both define the same thing, differently, on 32 bit x86
68EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF "
69EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF "
70
72# Javascript JIT is not supported on powerpc 71# Javascript JIT is not supported on powerpc
73EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " 72EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF "
74EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " 73EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF "
@@ -82,6 +81,7 @@ EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF "
82# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 81# https://sourceware.org/bugzilla/show_bug.cgi?id=18430
83EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " 82EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
84EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " 83EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF "
84EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF "
85EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " 85EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
86 86
87EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" 87EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON"
@@ -93,14 +93,14 @@ EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF "
93# An attempt was made to upstream JIT support for x32 in 93# An attempt was made to upstream JIT support for x32 in
94# 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
95# unresolved due to limited X32 adoption. 95# unresolved due to limited X32 adoption.
96EXTRA_OECMAKE_append_linux-gnux32 = " -DENABLE_JIT=OFF" 96EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF "
97 97
98SECURITY_CFLAGS_remove_aarch64 = "-fpie" 98SECURITY_CFLAGS_remove_aarch64 = "-fpie"
99SECURITY_CFLAGS_append_aarch64 = " -fPIE" 99SECURITY_CFLAGS_append_aarch64 = " -fPIE"
100 100
101FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" 101FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
102 102
103RRECOMMENDS_${PN} += "ca-certificates" 103RRECOMMENDS_${PN} += "ca-certificates shared-mime-info"
104 104
105# http://errors.yoctoproject.org/Errors/Details/20370/ 105# http://errors.yoctoproject.org/Errors/Details/20370/
106ARM_INSTRUCTION_SET_armv4 = "arm" 106ARM_INSTRUCTION_SET_armv4 = "arm"
@@ -114,3 +114,8 @@ ARM_INSTRUCTION_SET_armv6 = "arm"
114ARM_INSTRUCTION_SET_armv7a = "thumb" 114ARM_INSTRUCTION_SET_armv7a = "thumb"
115ARM_INSTRUCTION_SET_armv7r = "thumb" 115ARM_INSTRUCTION_SET_armv7r = "thumb"
116ARM_INSTRUCTION_SET_armv7ve = "thumb" 116ARM_INSTRUCTION_SET_armv7ve = "thumb"
117
118# qemu: uncaught target signal 11 (Segmentation fault) - core dumped
119# Segmentation fault
120GI_DATA_ENABLED_armv7a = "False"
121GI_DATA_ENABLED_armv7ve = "False"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 03:45:45 +0000