diff options
Diffstat (limited to 'meta')
14 files changed, 377 insertions, 357 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 25b3c9f243..0000000000 --- a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null | |||
@@ -1,223 +0,0 @@ | |||
1 | From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 | ||
4 | Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem | ||
5 | |||
6 | gcc-6 has now introduced stdlib.h in libstdc++ for better | ||
7 | compliance and its including the C library stdlib.h using | ||
8 | include_next which is sensitive to order of system header | ||
9 | include paths. Its infact better to not tinker with the | ||
10 | system header include paths at all. Since adding /usr/include | ||
11 | to -system is redundant and compiler knows about it moreover | ||
12 | now with gcc6 it interferes with compiler's functioning | ||
13 | and 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 | |||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Source/cmake/WebKitMacros.cmake | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | Index: webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt | ||
25 | =================================================================== | ||
26 | --- webkitgtk-2.12.1.orig/Source/JavaScriptCore/CMakeLists.txt | ||
27 | +++ webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt | ||
28 | @@ -1311,7 +1311,7 @@ add_subdirectory(shell) | ||
29 | |||
30 | WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES}) | ||
31 | include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES}) | ||
32 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
33 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
34 | add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES}) | ||
35 | target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES}) | ||
36 | set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore") | ||
37 | Index: webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt | ||
38 | =================================================================== | ||
39 | --- webkitgtk-2.12.1.orig/Source/WTF/wtf/CMakeLists.txt | ||
40 | +++ webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt | ||
41 | @@ -286,7 +286,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
42 | |||
43 | WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES}) | ||
44 | include_directories(${WTF_INCLUDE_DIRECTORIES}) | ||
45 | -include_directories(SYSTEM ${WTF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
46 | +include_directories(${WTF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
47 | add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES}) | ||
48 | target_link_libraries(WTF ${WTF_LIBRARIES}) | ||
49 | set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF") | ||
50 | Index: webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt | ||
51 | =================================================================== | ||
52 | --- webkitgtk-2.12.1.orig/Source/WebCore/CMakeLists.txt | ||
53 | +++ webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt | ||
54 | @@ -3748,7 +3748,7 @@ WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FIL | ||
55 | WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES}) | ||
56 | |||
57 | include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES}) | ||
58 | -include_directories(SYSTEM ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
59 | +include_directories(${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
60 | |||
61 | if (MSVC) | ||
62 | ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES) | ||
63 | Index: webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt | ||
64 | =================================================================== | ||
65 | --- webkitgtk-2.12.1.orig/Source/WebKit/CMakeLists.txt | ||
66 | +++ webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt | ||
67 | @@ -28,7 +28,7 @@ set(WebKit_LIBRARIES | ||
68 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
69 | |||
70 | include_directories(${WebKit_INCLUDE_DIRECTORIES}) | ||
71 | -include_directories(SYSTEM ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) | ||
72 | +include_directories(${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) | ||
73 | |||
74 | if (MSVC) | ||
75 | ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES) | ||
76 | Index: webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt | ||
77 | =================================================================== | ||
78 | --- webkitgtk-2.12.1.orig/Source/WebKit2/CMakeLists.txt | ||
79 | +++ webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt | ||
80 | @@ -756,7 +756,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
81 | GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}") | ||
82 | |||
83 | include_directories(${WebKit2_INCLUDE_DIRECTORIES}) | ||
84 | -include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES}) | ||
85 | +include_directories(${WebKit2_SYSTEM_INCLUDE_DIRECTORIES}) | ||
86 | add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES}) | ||
87 | |||
88 | add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES}) | ||
89 | Index: webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
90 | =================================================================== | ||
91 | --- webkitgtk-2.12.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
92 | +++ webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
93 | @@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCL | ||
94 | ) | ||
95 | |||
96 | include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) | ||
97 | -include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) | ||
98 | +include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) | ||
99 | |||
100 | set(WebKitTestNetscapePlugin_LIBRARIES | ||
101 | ${X11_LIBRARIES} | ||
102 | Index: webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt | ||
103 | =================================================================== | ||
104 | --- webkitgtk-2.12.1.orig/Tools/ImageDiff/CMakeLists.txt | ||
105 | +++ webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt | ||
106 | @@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES | ||
107 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
108 | |||
109 | include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) | ||
110 | -include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
111 | +include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
112 | add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) | ||
113 | target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) | ||
114 | set_target_properties(ImageDiff PROPERTIES FOLDER "Tools") | ||
115 | Index: webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
116 | =================================================================== | ||
117 | --- webkitgtk-2.12.1.orig/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
118 | +++ webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
119 | @@ -55,7 +55,7 @@ endif () | ||
120 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) | ||
121 | |||
122 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) | ||
123 | -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
124 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
125 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) | ||
126 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | ||
127 | set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools") | ||
128 | Index: webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt | ||
129 | =================================================================== | ||
130 | --- webkitgtk-2.12.1.orig/Tools/WebKitTestRunner/CMakeLists.txt | ||
131 | +++ webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt | ||
132 | @@ -115,7 +115,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURC | ||
133 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
134 | |||
135 | include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) | ||
136 | -include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
137 | +include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
138 | |||
139 | add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) | ||
140 | target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) | ||
141 | Index: webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake | ||
142 | =================================================================== | ||
143 | --- webkitgtk-2.12.1.orig/Source/WebCore/PlatformGTK.cmake | ||
144 | +++ webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake | ||
145 | @@ -324,7 +324,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
146 | ${GTK2_INCLUDE_DIRS} | ||
147 | ${GDK2_INCLUDE_DIRS} | ||
148 | ) | ||
149 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE | ||
150 | + target_include_directories(WebCorePlatformGTK2 PRIVATE | ||
151 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
152 | ) | ||
153 | target_link_libraries(WebCorePlatformGTK2 | ||
154 | @@ -366,7 +366,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP | ||
155 | target_include_directories(WebCorePlatformGTK PRIVATE | ||
156 | ${WebCore_INCLUDE_DIRECTORIES} | ||
157 | ) | ||
158 | -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE | ||
159 | +target_include_directories(WebCorePlatformGTK PRIVATE | ||
160 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
161 | ${GTK_INCLUDE_DIRS} | ||
162 | ${GDK_INCLUDE_DIRS} | ||
163 | @@ -384,7 +384,7 @@ include_directories( | ||
164 | "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}" | ||
165 | ) | ||
166 | |||
167 | -include_directories(SYSTEM | ||
168 | +include_directories( | ||
169 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
170 | ) | ||
171 | |||
172 | Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
173 | =================================================================== | ||
174 | --- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
175 | +++ webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
176 | @@ -20,7 +20,7 @@ include_directories( | ||
177 | ${WEBKIT2_DIR}/UIProcess/API/gtk | ||
178 | ) | ||
179 | |||
180 | -include_directories(SYSTEM | ||
181 | +include_directories( | ||
182 | ${GDK3_INCLUDE_DIRS} | ||
183 | ${GLIB_INCLUDE_DIRS} | ||
184 | ${GTK3_INCLUDE_DIRS} | ||
185 | Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
186 | =================================================================== | ||
187 | --- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
188 | +++ webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
189 | @@ -23,7 +23,7 @@ include_directories( | ||
190 | ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk | ||
191 | ) | ||
192 | |||
193 | -include_directories(SYSTEM | ||
194 | +include_directories( | ||
195 | ${ATSPI_INCLUDE_DIRS} | ||
196 | ${GLIB_INCLUDE_DIRS} | ||
197 | ${GSTREAMER_INCLUDE_DIRS} | ||
198 | Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | ||
199 | =================================================================== | ||
200 | --- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake | ||
201 | +++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | ||
202 | @@ -816,7 +816,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
203 | target_include_directories(WebKitPluginProcess2 PRIVATE | ||
204 | ${WebKit2CommonIncludeDirectories} | ||
205 | ) | ||
206 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE | ||
207 | + target_include_directories(WebKitPluginProcess2 PRIVATE | ||
208 | ${WebKit2CommonSystemIncludeDirectories} | ||
209 | ${GTK2_INCLUDE_DIRS} | ||
210 | ${GDK2_INCLUDE_DIRS} | ||
211 | Index: webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt | ||
212 | =================================================================== | ||
213 | --- webkitgtk-2.12.1.orig/Source/JavaScriptCore/shell/CMakeLists.txt | ||
214 | +++ webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt | ||
215 | @@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
216 | |||
217 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) | ||
218 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) | ||
219 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
220 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
221 | add_executable(jsc ${JSC_SOURCES}) | ||
222 | target_link_libraries(jsc ${JSC_LIBRARIES}) | ||
223 | set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") | ||
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 @@ | |||
1 | Replace __GLIBC__ with __linux__ since musl also supports it | ||
2 | so checking __linux__ is more accomodating | ||
3 | |||
4 | See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Index: 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 @@ | |||
1 | ucontext structure is different between musl and glibc for ppc | ||
2 | therefore its not enough just to check for arch alone, we also | ||
3 | need to check for libc type. | ||
4 | |||
5 | Fixes errors like | ||
6 | |||
7 | Source/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 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | |||
14 | Index: 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 @@ | |||
1 | From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 6 Oct 2017 17:00:08 +0300 | ||
4 | Subject: [PATCH] Fix build with musl | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-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 | |||
13 | diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h | ||
14 | index 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) | ||
62 | diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h | ||
63 | index 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 | -- | ||
76 | 2.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 @@ | |||
1 | From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 | 1 | From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 | 3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 |
4 | Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir | 4 | Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-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 | ||
12 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake | 13 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
13 | index adaa010..f18cf8a 100644 | 14 | index 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 | -- |
47 | 2.9.3 | 48 | 2.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 @@ | |||
1 | From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 | 1 | From 9b09974003097c9a408bbeea568996768efe705b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 | 3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 |
4 | Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under | 4 | Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works |
5 | OpenEmbedded build system | 5 | under OpenEmbedded build system |
6 | 6 | ||
7 | This requires setting a few environment variables so that the transient | 7 | This requires setting a few environment variables so that the transient |
8 | binary is build and linked correctly, and disabling the tweaks to RUN | 8 | binary 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 | ||
11 | Upstream-Status: Inappropriate [oe-specific] | 11 | Upstream-Status: Inappropriate [oe-specific] |
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 12 | Signed-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 | ||
18 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake | 19 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake |
19 | index af4d2e3..b7b93c7 100644 | 20 | index 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 |
31 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py | 32 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py |
32 | index 4c8237b..c0205f0 100644 | 33 | index 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 | -- |
48 | 2.8.1 | 49 | 2.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 @@ | |||
1 | From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 | ||
4 | Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem | ||
5 | |||
6 | gcc-6 has now introduced stdlib.h in libstdc++ for better | ||
7 | compliance and its including the C library stdlib.h using | ||
8 | include_next which is sensitive to order of system header | ||
9 | include paths. Its infact better to not tinker with the | ||
10 | system header include paths at all. Since adding /usr/include | ||
11 | to -system is redundant and compiler knows about it moreover | ||
12 | now with gcc6 it interferes with compiler's functioning | ||
13 | and 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 | |||
17 | Signed-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 | |||
28 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt | ||
29 | index 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 | |||
41 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake | ||
42 | index 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 | |||
72 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | ||
73 | index 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} | ||
85 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake | ||
86 | index 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} | ||
98 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
99 | index 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 | |||
111 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
112 | index 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 | -- | ||
125 | 2.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 @@ | |||
1 | From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001 | 1 | From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 | 3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 |
4 | Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the | 4 | Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to |
5 | compiler flags. | 5 | the compiler flags. |
6 | 6 | ||
7 | g-ir-compiler is using a C compiler internally, so it needs to set | 7 | g-ir-compiler is using a C compiler internally, so it needs to set |
8 | the proper flags for it. | 8 | the proper flags for it. |
9 | 9 | ||
10 | Upstream-Status: Pending [review on oe-core list] | 10 | Upstream-Status: Pending [review on oe-core list] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-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 | ||
16 | Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | 17 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
17 | =================================================================== | 18 | index 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 | -- | ||
40 | 2.14.1 | ||
41 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch new file mode 100644 index 0000000000..4d1de72851 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Disable the tests meant to run when compiling natively | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake | ||
7 | =================================================================== | ||
8 | --- webkitgtk-2.14.5.orig/Source/cmake/OptionsCommon.cmake | ||
9 | +++ webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake | ||
10 | @@ -67,8 +67,11 @@ endif () | ||
11 | # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux. | ||
12 | # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53. | ||
13 | # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual) | ||
14 | -set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) | ||
15 | -if (WTF_CPU_ARM64 AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) | ||
16 | +if( NOT WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) | ||
17 | + set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) | ||
18 | +endif(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) | ||
19 | + | ||
20 | +if (WTF_CPU_ARM64 AND NOT CMAKE_CROSSCOMPILING AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) | ||
21 | execute_process(COMMAND nproc OUTPUT_VARIABLE PROC_COUNT) | ||
22 | math(EXPR PROC_MAX ${PROC_COUNT}-1) | ||
23 | foreach (PROC_ID RANGE ${PROC_MAX}) | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch new file mode 100644 index 0000000000..c6157e1037 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 17 May 2017 22:34:24 -0700 | ||
4 | Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 | ||
5 | |||
6 | Taken from | ||
7 | https://bugs.webkit.org/show_bug.cgi?id=161900 | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | --- | ||
13 | Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- | ||
14 | 1 file changed, 9 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt | ||
17 | index 6b5e45b9..46ee3c22 100644 | ||
18 | --- a/Source/WTF/wtf/CMakeLists.txt | ||
19 | +++ b/Source/WTF/wtf/CMakeLists.txt | ||
20 | @@ -205,7 +205,6 @@ set(WTF_HEADERS | ||
21 | |||
22 | set(WTF_SOURCES | ||
23 | Assertions.cpp | ||
24 | - Atomics.cpp | ||
25 | AutomaticThread.cpp | ||
26 | BitVector.cpp | ||
27 | CPUTime.cpp | ||
28 | @@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) | ||
29 | list(APPEND WTF_LIBRARIES bmalloc) | ||
30 | endif () | ||
31 | |||
32 | +file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp | ||
33 | + "int main(void)\n" | ||
34 | + "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n") | ||
35 | +try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp) | ||
36 | +if (NOT ATOMICS_BUILD_SUCCEEDED) | ||
37 | + list(APPEND WTF_SOURCES Atomics.cpp) | ||
38 | +endif () | ||
39 | +file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) | ||
40 | + | ||
41 | list(APPEND WTF_SOURCES | ||
42 | unicode/icu/CollatorICU.cpp | ||
43 | ) | ||
44 | -- | ||
45 | 2.14.1 | ||
46 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch new file mode 100644 index 0000000000..5f23837585 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From: Daniel Schepler <dschepler@gmail.com> | ||
2 | Subject: Fix FTBFS in x32 | ||
3 | Bug-Debian: https://bugs.debian.org/700795 | ||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
6 | Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h | ||
7 | =================================================================== | ||
8 | --- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h | ||
9 | +++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h | ||
10 | @@ -172,7 +172,11 @@ | ||
11 | /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ | ||
12 | #if defined(__x86_64__) \ | ||
13 | || defined(_M_X64) | ||
14 | +#ifdef __ILP32__ | ||
15 | +#define WTF_CPU_X86_64_32 1 | ||
16 | +#else | ||
17 | #define WTF_CPU_X86_64 1 | ||
18 | +#endif | ||
19 | #define WTF_CPU_X86_SSE2 1 | ||
20 | #endif | ||
21 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb index 11c91c1d0b..ccef5ff2fb 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb | |||
@@ -4,45 +4,42 @@ BUGTRACKER = "http://bugs.webkit.org/" | |||
4 | 4 | ||
5 | LICENSE = "BSD & LGPLv2+" | 5 | LICENSE = "BSD & LGPLv2+" |
6 | LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ | 6 | LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ |
7 | file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \ | ||
8 | file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ | 7 | file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ |
9 | file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ | 8 | file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ |
10 | file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ | 9 | file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ |
11 | " | 10 | " |
12 | 11 | ||
13 | SRC_URI = "\ | 12 | SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ |
14 | http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | 13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ |
15 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | 14 | file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ |
16 | file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ | 15 | file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ |
17 | file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ | 16 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ |
18 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ | 17 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ |
19 | file://musl-fixes.patch \ | 18 | file://x32_support.patch \ |
20 | file://ppc-musl-fix.patch \ | 19 | file://cross-compile.patch \ |
21 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ | 20 | file://detect-atomics-during-configure.patch \ |
22 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ | 21 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ |
23 | " | 22 | file://0001-Fix-build-with-musl.patch \ |
24 | SRC_URI[md5sum] = "7a9ea00ec195488db90fdeb2d174ddaf" | 23 | " |
25 | SRC_URI[sha256sum] = "6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40" | 24 | |
25 | SRC_URI[md5sum] = "af18c2cfa00cadfd0b4d8db21cab011d" | ||
26 | SRC_URI[sha256sum] = "0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8" | ||
26 | 27 | ||
27 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 28 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
28 | 29 | ||
29 | # We cannot inherit pythonnative because that would conflict with inheriting python3native | ||
30 | # (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary | ||
31 | # so we simply set it explicitly here. | ||
32 | EXTRANATIVEPATH += "python-native" | ||
33 | |||
34 | # depends on libxt | 30 | # depends on libxt |
35 | REQUIRED_DISTRO_FEATURES = "x11" | 31 | REQUIRED_DISTRO_FEATURES = "x11" |
36 | 32 | ||
37 | DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ | 33 | DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ |
38 | 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 \ |
39 | pango icu bison-native gawk intltool-native libwebp \ | 35 | pango icu bison-native gawk intltool-native libwebp \ |
40 | atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ | 36 | atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ |
41 | ruby-native libnotify gstreamer1.0-plugins-bad \ | 37 | ruby-native libnotify gstreamer1.0-plugins-bad \ |
38 | gettext-native glib-2.0 glib-2.0-native libtasn1 \ | ||
42 | " | 39 | " |
43 | 40 | ||
44 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ | 41 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ |
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ |
46 | enchant \ | 43 | enchant \ |
47 | libsecret \ | 44 | libsecret \ |
48 | " | 45 | " |
@@ -54,7 +51,8 @@ PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant | |||
54 | PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" | 51 | PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" |
55 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" | 52 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" |
56 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" | 53 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" |
57 | PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret" | 54 | PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" |
55 | PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" | ||
58 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" | 56 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" |
59 | 57 | ||
60 | EXTRA_OECMAKE = " \ | 58 | EXTRA_OECMAKE = " \ |
@@ -63,8 +61,13 @@ EXTRA_OECMAKE = " \ | |||
63 | ${@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)} \ |
64 | ${@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)} \ |
65 | -DENABLE_MINIBROWSER=ON \ | 63 | -DENABLE_MINIBROWSER=ON \ |
64 | -DPYTHON_EXECUTABLE=`which python` \ | ||
66 | " | 65 | " |
67 | 66 | ||
67 | # GL/GLES header clash: both define the same thing, differently, on 32 bit x86 | ||
68 | EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF " | ||
69 | EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF " | ||
70 | |||
68 | # Javascript JIT is not supported on powerpc | 71 | # Javascript JIT is not supported on powerpc |
69 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " | 72 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " |
70 | EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " | 73 | EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " |
@@ -77,19 +80,28 @@ EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " | |||
77 | # binutils 2.25.1 has a bug on aarch64: | 80 | # binutils 2.25.1 has a bug on aarch64: |
78 | # https://sourceware.org/bugzilla/show_bug.cgi?id=18430 | 81 | # https://sourceware.org/bugzilla/show_bug.cgi?id=18430 |
79 | EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " | 82 | EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " |
80 | EXTRA_OECMAKE_append_mips = " -DUSE_LD_GOLD=OFF " | 83 | EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " |
81 | EXTRA_OECMAKE_append_mips64 = " -DUSE_LD_GOLD=OFF " | 84 | EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " |
82 | EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " | 85 | EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " |
83 | 86 | ||
87 | EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" | ||
88 | |||
84 | # JIT not supported on MIPS either | 89 | # JIT not supported on MIPS either |
85 | EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF " | 90 | EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " |
86 | EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " | 91 | |
92 | # JIT not supported on X32 | ||
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 | ||
95 | # unresolved due to limited X32 adoption. | ||
96 | EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " | ||
87 | 97 | ||
88 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" | 98 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" |
89 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" | 99 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" |
90 | 100 | ||
91 | FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" | 101 | FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" |
92 | 102 | ||
103 | RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" | ||
104 | |||
93 | # http://errors.yoctoproject.org/Errors/Details/20370/ | 105 | # http://errors.yoctoproject.org/Errors/Details/20370/ |
94 | ARM_INSTRUCTION_SET_armv4 = "arm" | 106 | ARM_INSTRUCTION_SET_armv4 = "arm" |
95 | ARM_INSTRUCTION_SET_armv5 = "arm" | 107 | ARM_INSTRUCTION_SET_armv5 = "arm" |
@@ -105,4 +117,10 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb" | |||
105 | 117 | ||
106 | # WebKit2-4.0: ../../libgpg-error-1.21/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed. | 118 | # WebKit2-4.0: ../../libgpg-error-1.21/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed. |
107 | # qemu: uncaught target signal 6 (Aborted) - core dumped | 119 | # qemu: uncaught target signal 6 (Aborted) - core dumped |
108 | EXTRA_OECMAKE_append_mips64 = " -DENABLE_INTROSPECTION=OFF -DENABLE_GTKDOC=OFF" | 120 | EXTRA_OECMAKE_append_mipsarchn32 = " -DENABLE_INTROSPECTION=OFF -DENABLE_GTKDOC=OFF" |
121 | EXTRA_OECMAKE_append_mipsarchn64 = " -DENABLE_INTROSPECTION=OFF -DENABLE_GTKDOC=OFF" | ||
122 | |||
123 | # qemu: uncaught target signal 11 (Segmentation fault) - core dumped | ||
124 | # Segmentation fault | ||
125 | GI_DATA_ENABLED_armv7a = "False" | ||
126 | GI_DATA_ENABLED_armv7ve = "False" | ||