diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | 125 |
1 files changed, 0 insertions, 125 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 deleted file mode 100644 index e71905d26a..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | From d1634e56a2589ec62325011bf77d480a67123b52 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 | --- | ||
22 | Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- | ||
23 | Source/WebCore/PlatformGTK.cmake | 6 +++--- | ||
24 | Source/WebKit/PlatformGTK.cmake | 2 +- | ||
25 | Source/cmake/WebKitMacros.cmake | 2 +- | ||
26 | Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- | ||
27 | Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- | ||
28 | 6 files changed, 8 insertions(+), 8 deletions(-) | ||
29 | |||
30 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt | ||
31 | index 87153e35..cd0beed4 100644 | ||
32 | --- a/Source/JavaScriptCore/shell/CMakeLists.txt | ||
33 | +++ b/Source/JavaScriptCore/shell/CMakeLists.txt | ||
34 | @@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
35 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) | ||
36 | WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) | ||
37 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}) | ||
38 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
39 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
40 | add_executable(jsc ${JSC_SOURCES}) | ||
41 | target_link_libraries(jsc ${JSC_LIBRARIES}) | ||
42 | |||
43 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake | ||
44 | index e0dd9cd9..a2997f3e 100644 | ||
45 | --- a/Source/WebCore/PlatformGTK.cmake | ||
46 | +++ b/Source/WebCore/PlatformGTK.cmake | ||
47 | @@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
48 | target_include_directories(WebCorePlatformGTK2 PRIVATE | ||
49 | ${WebCore_INCLUDE_DIRECTORIES} | ||
50 | ) | ||
51 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE | ||
52 | + target_include_directories(WebCorePlatformGTK2 PRIVATE | ||
53 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
54 | ${GTK2_INCLUDE_DIRS} | ||
55 | ${GDK2_INCLUDE_DIRS} | ||
56 | @@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore) | ||
57 | target_include_directories(WebCorePlatformGTK PRIVATE | ||
58 | ${WebCore_INCLUDE_DIRECTORIES} | ||
59 | ) | ||
60 | -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE | ||
61 | +target_include_directories(WebCorePlatformGTK PRIVATE | ||
62 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
63 | ${GTK_INCLUDE_DIRS} | ||
64 | ${GDK_INCLUDE_DIRS} | ||
65 | @@ -206,7 +206,7 @@ include_directories( | ||
66 | "${WEBCORE_DIR}/bindings/gobject/" | ||
67 | ) | ||
68 | |||
69 | -include_directories(SYSTEM | ||
70 | +include_directories( | ||
71 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
72 | ) | ||
73 | |||
74 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | ||
75 | index 693bbdfe..20e3802f 100644 | ||
76 | --- a/Source/WebKit/PlatformGTK.cmake | ||
77 | +++ b/Source/WebKit/PlatformGTK.cmake | ||
78 | @@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
79 | target_include_directories(WebKitPluginProcess2 PRIVATE | ||
80 | ${WebKitCommonIncludeDirectories} | ||
81 | ) | ||
82 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE | ||
83 | + target_include_directories(WebKitPluginProcess2 PRIVATE | ||
84 | ${WebKitCommonSystemIncludeDirectories} | ||
85 | ${GTK2_INCLUDE_DIRS} | ||
86 | ${GDK2_INCLUDE_DIRS} | ||
87 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake | ||
88 | index 6d58d57e..976e2362 100644 | ||
89 | --- a/Source/cmake/WebKitMacros.cmake | ||
90 | +++ b/Source/cmake/WebKitMacros.cmake | ||
91 | @@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target) | ||
92 | ${${_target}_SOURCES} | ||
93 | ) | ||
94 | target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>") | ||
95 | - target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") | ||
96 | + target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") | ||
97 | target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>") | ||
98 | target_link_libraries(${_target} ${${_target}_LIBRARIES}) | ||
99 | set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") | ||
100 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
101 | index a0d32059..f259ade2 100644 | ||
102 | --- a/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
103 | +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
104 | @@ -59,7 +59,7 @@ endif () | ||
105 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) | ||
106 | |||
107 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) | ||
108 | -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
109 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
110 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) | ||
111 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | ||
112 | |||
113 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
114 | index 8dd0e146..d037fc35 100644 | ||
115 | --- a/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
116 | +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
117 | @@ -22,7 +22,7 @@ include_directories( | ||
118 | ${WEBKIT_DIR}/UIProcess/API/gtk | ||
119 | ) | ||
120 | |||
121 | -include_directories(SYSTEM | ||
122 | +include_directories( | ||
123 | ${GDK3_INCLUDE_DIRS} | ||
124 | ${GLIB_INCLUDE_DIRS} | ||
125 | ${GSTREAMER_INCLUDE_DIRS} | ||