summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-25 01:35:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-09 09:24:15 +0100
commit700b846ba0e0f31b06459aee3ebb3ce5f1715918 (patch)
treed7445e2998e287360ee0f0bece67ded8fcc4fb85 /meta/recipes-sato/webkit/webkitgtk
parentaa0ddeb79a438b052b11b13d6b7b044f34806fe8 (diff)
downloadpoky-700b846ba0e0f31b06459aee3ebb3ce5f1715918.tar.gz
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>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch170
1 files changed, 170 insertions, 0 deletions
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..d6f0ce3cd6
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -0,0 +1,170 @@
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.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
25===================================================================
26--- webkitgtk-2.16.5.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
27+++ webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
28@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugIn_SYSTEM_INCL
29 )
30
31 include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES})
32-include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES})
33+include_directories(${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES})
34
35 set(WebKitTestNetscapePlugIn_LIBRARIES
36 ${X11_LIBRARIES}
37Index: webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt
38===================================================================
39--- webkitgtk-2.16.5.orig/Tools/ImageDiff/CMakeLists.txt
40+++ webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt
41@@ -9,6 +9,6 @@ set(IMAGE_DIFF_LIBRARIES
42 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
43
44 include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
45-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
46+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
47 add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
48 target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
49Index: webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt
50===================================================================
51--- webkitgtk-2.16.5.orig/Tools/MiniBrowser/gtk/CMakeLists.txt
52+++ webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt
53@@ -57,7 +57,7 @@ endif ()
54 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
55
56 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
57-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
58+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
59 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
60 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
61
62Index: webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt
63===================================================================
64--- webkitgtk-2.16.5.orig/Tools/WebKitTestRunner/CMakeLists.txt
65+++ webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt
66@@ -106,7 +106,7 @@ GENERATE_BINDINGS(WebKitTestRunnerBindin
67 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
68
69 include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
70-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
71+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
72
73 add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
74 target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
75Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
76===================================================================
77--- webkitgtk-2.16.5.orig/Source/WebCore/PlatformGTK.cmake
78+++ webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
79@@ -321,7 +321,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
80 ${GTK2_INCLUDE_DIRS}
81 ${GDK2_INCLUDE_DIRS}
82 )
83- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
84+ target_include_directories(WebCorePlatformGTK2 PRIVATE
85 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
86 )
87 target_link_libraries(WebCorePlatformGTK2
88@@ -346,7 +346,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP
89 target_include_directories(WebCorePlatformGTK PRIVATE
90 ${WebCore_INCLUDE_DIRECTORIES}
91 )
92-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
93+target_include_directories(WebCorePlatformGTK PRIVATE
94 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
95 ${GTK_INCLUDE_DIRS}
96 ${GDK_INCLUDE_DIRS}
97@@ -362,7 +362,7 @@ include_directories(
98 "${WEBCORE_DIR}/bindings/gobject/"
99 )
100
101-include_directories(SYSTEM
102+include_directories(
103 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
104 )
105
106Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake
107===================================================================
108--- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/PlatformGTK.cmake
109+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake
110@@ -20,7 +20,7 @@ include_directories(
111 ${WEBKIT2_DIR}/UIProcess/API/gtk
112 )
113
114-include_directories(SYSTEM
115+include_directories(
116 ${GDK3_INCLUDE_DIRS}
117 ${GLIB_INCLUDE_DIRS}
118 ${GTK3_INCLUDE_DIRS}
119Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
120===================================================================
121--- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
122+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
123@@ -21,7 +21,7 @@ include_directories(
124 ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
125 )
126
127-include_directories(SYSTEM
128+include_directories(
129 ${ATSPI_INCLUDE_DIRS}
130 ${GLIB_INCLUDE_DIRS}
131 ${GSTREAMER_INCLUDE_DIRS}
132Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
133===================================================================
134--- webkitgtk-2.16.5.orig/Source/WebKit2/PlatformGTK.cmake
135+++ webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
136@@ -1156,7 +1156,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
137 target_include_directories(WebKitPluginProcess2 PRIVATE
138 ${WebKit2CommonIncludeDirectories}
139 )
140- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
141+ target_include_directories(WebKitPluginProcess2 PRIVATE
142 ${WebKit2CommonSystemIncludeDirectories}
143 ${GTK2_INCLUDE_DIRS}
144 ${GDK2_INCLUDE_DIRS}
145Index: webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt
146===================================================================
147--- webkitgtk-2.16.5.orig/Source/JavaScriptCore/shell/CMakeLists.txt
148+++ webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt
149@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
150
151 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
152 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
153-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
154+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
155 add_executable(jsc ${JSC_SOURCES})
156 target_link_libraries(jsc ${JSC_LIBRARIES})
157
158Index: webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake
159===================================================================
160--- webkitgtk-2.16.5.orig/Source/cmake/WebKitMacros.cmake
161+++ webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake
162@@ -277,7 +277,7 @@ macro(WEBKIT_WRAP_SOURCELIST)
163 endmacro()
164
165 macro(WEBKIT_FRAMEWORK _target)
166- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
167+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
168 add_library(${_target} ${${_target}_LIBRARY_TYPE}
169 ${${_target}_HEADERS}
170 ${${_target}_SOURCES}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 12:10:29 +0000