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.patch181
1 files changed, 0 insertions, 181 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 ef209c81ae..0000000000
--- a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ /dev/null
@@ -1,181 +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
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Upstream-Status: Pending
19---
20 Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
21 Source/WebCore/PlatformGTK.cmake | 6 +++---
22 Source/WebKit2/PlatformGTK.cmake | 2 +-
23 Source/cmake/WebKitMacros.cmake | 2 +-
24 Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +-
25 Tools/ImageDiff/CMakeLists.txt | 2 +-
26 Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
27 Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
28 Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 2 +-
29 Tools/WebKitTestRunner/CMakeLists.txt | 2 +-
30 10 files changed, 12 insertions(+), 12 deletions(-)
31
32diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
33index 155c797..80fe22b 100644
34--- a/Source/JavaScriptCore/shell/CMakeLists.txt
35+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
36@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
37
38 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
39 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
40-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
41+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
42 add_executable(jsc ${JSC_SOURCES})
43 target_link_libraries(jsc ${JSC_LIBRARIES})
44
45diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
46index 567bd79..1fabea8 100644
47--- a/Source/WebCore/PlatformGTK.cmake
48+++ b/Source/WebCore/PlatformGTK.cmake
49@@ -340,7 +340,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
50 ${GTK2_INCLUDE_DIRS}
51 ${GDK2_INCLUDE_DIRS}
52 )
53- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
54+ target_include_directories(WebCorePlatformGTK2 PRIVATE
55 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
56 )
57 target_link_libraries(WebCorePlatformGTK2
58@@ -365,7 +365,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCorePlatformGTK)
59 target_include_directories(WebCorePlatformGTK PRIVATE
60 ${WebCore_INCLUDE_DIRECTORIES}
61 )
62-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
63+target_include_directories(WebCorePlatformGTK PRIVATE
64 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
65 ${GTK_INCLUDE_DIRS}
66 ${GDK_INCLUDE_DIRS}
67@@ -383,7 +383,7 @@ include_directories(
68 "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
69 )
70
71-include_directories(SYSTEM
72+include_directories(
73 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
74 )
75
76diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
77index e4805a4..c57df5d 100644
78--- a/Source/WebKit2/PlatformGTK.cmake
79+++ b/Source/WebKit2/PlatformGTK.cmake
80@@ -822,7 +822,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
81 target_include_directories(WebKitPluginProcess2 PRIVATE
82 ${WebKit2CommonIncludeDirectories}
83 )
84- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
85+ target_include_directories(WebKitPluginProcess2 PRIVATE
86 ${WebKit2CommonSystemIncludeDirectories}
87 ${GTK2_INCLUDE_DIRS}
88 ${GDK2_INCLUDE_DIRS}
89diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
90index 043e78e..8b3b642 100644
91--- a/Source/cmake/WebKitMacros.cmake
92+++ b/Source/cmake/WebKitMacros.cmake
93@@ -224,7 +224,7 @@ endmacro()
94
95 macro(WEBKIT_FRAMEWORK _target)
96 include_directories(${${_target}_INCLUDE_DIRECTORIES})
97- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
98+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
99 add_library(${_target} ${${_target}_LIBRARY_TYPE}
100 ${${_target}_HEADERS}
101 ${${_target}_SOURCES}
102diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
103index c431667..6dff244 100644
104--- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
105+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
106@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES
107 )
108
109 include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})
110-include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
111+include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
112
113 set(WebKitTestNetscapePlugin_LIBRARIES
114 ${X11_LIBRARIES}
115diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
116index b15443f..87e03bf 100644
117--- a/Tools/ImageDiff/CMakeLists.txt
118+++ b/Tools/ImageDiff/CMakeLists.txt
119@@ -14,6 +14,6 @@ set(IMAGE_DIFF_LIBRARIES
120 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
121
122 include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
123-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
124+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
125 add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
126 target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
127diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
128index 0704bc6..619e5a5 100644
129--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
130+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
131@@ -58,7 +58,7 @@ endif ()
132 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
133
134 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
135-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
136+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
137 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
138 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
139
140diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
141index 7552cc2..2eb44d5 100644
142--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
143+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
144@@ -20,7 +20,7 @@ include_directories(
145 ${WEBKIT2_DIR}/UIProcess/API/gtk
146 )
147
148-include_directories(SYSTEM
149+include_directories(
150 ${GDK3_INCLUDE_DIRS}
151 ${GLIB_INCLUDE_DIRS}
152 ${GTK3_INCLUDE_DIRS}
153diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
154index b0b4739..434e4ca 100644
155--- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
156+++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
157@@ -23,7 +23,7 @@ include_directories(
158 ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
159 )
160
161-include_directories(SYSTEM
162+include_directories(
163 ${ATSPI_INCLUDE_DIRS}
164 ${GLIB_INCLUDE_DIRS}
165 ${GSTREAMER_INCLUDE_DIRS}
166diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
167index 7db90f2..a4f917f 100644
168--- a/Tools/WebKitTestRunner/CMakeLists.txt
169+++ b/Tools/WebKitTestRunner/CMakeLists.txt
170@@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES
171 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
172
173 include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
174-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
175+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
176
177 add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
178 target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
179--
1802.9.3
181
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 20:41:42 +0000