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.patch185
1 files changed, 0 insertions, 185 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