summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch')
-rw-r--r--meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch223
1 files changed, 0 insertions, 223 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 @@
1From 53a00058184cd710c6f4375f4daab49d7e885a30 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
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19Upstream-Status: Pending
20
21 Source/cmake/WebKitMacros.cmake | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24Index: 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")
37Index: 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")
50Index: 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)
63Index: 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)
76Index: 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})
89Index: 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}
102Index: 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")
115Index: 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")
128Index: 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})
141Index: 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
172Index: 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}
185Index: 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}
198Index: 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}
211Index: 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")
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-26 03:38:26 +0000