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 | 126 |
1 files changed, 126 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..dfdc116018 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | |||
@@ -0,0 +1,126 @@ | |||
1 | From ef832a115b40861c08df333339b1366da49e5393 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 9/9] 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 | --- | ||
20 | Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- | ||
21 | Source/WebCore/PlatformGTK.cmake | 6 +++--- | ||
22 | Source/WebKit/PlatformGTK.cmake | 2 +- | ||
23 | Source/cmake/WebKitMacros.cmake | 2 +- | ||
24 | Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- | ||
25 | Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- | ||
26 | 6 files changed, 8 insertions(+), 8 deletions(-) | ||
27 | |||
28 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt | ||
29 | index bc37dd31..4e49871f 100644 | ||
30 | --- a/Source/JavaScriptCore/shell/CMakeLists.txt | ||
31 | +++ b/Source/JavaScriptCore/shell/CMakeLists.txt | ||
32 | @@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
33 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) | ||
34 | WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) | ||
35 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) | ||
36 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
37 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
38 | add_executable(jsc ${JSC_SOURCES}) | ||
39 | target_link_libraries(jsc ${JSC_LIBRARIES}) | ||
40 | |||
41 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake | ||
42 | index 73506c74..8eb8b415 100644 | ||
43 | --- a/Source/WebCore/PlatformGTK.cmake | ||
44 | +++ b/Source/WebCore/PlatformGTK.cmake | ||
45 | @@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
46 | ${GTK2_INCLUDE_DIRS} | ||
47 | ${GDK2_INCLUDE_DIRS} | ||
48 | ) | ||
49 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE | ||
50 | + target_include_directories(WebCorePlatformGTK2 PRIVATE | ||
51 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
52 | ) | ||
53 | target_link_libraries(WebCorePlatformGTK2 | ||
54 | @@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore) | ||
55 | target_include_directories(WebCorePlatformGTK PRIVATE | ||
56 | ${WebCore_INCLUDE_DIRECTORIES} | ||
57 | ) | ||
58 | -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE | ||
59 | +target_include_directories(WebCorePlatformGTK PRIVATE | ||
60 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
61 | ${GTK_INCLUDE_DIRS} | ||
62 | ${GDK_INCLUDE_DIRS} | ||
63 | @@ -321,7 +321,7 @@ include_directories( | ||
64 | "${WEBCORE_DIR}/bindings/gobject/" | ||
65 | ) | ||
66 | |||
67 | -include_directories(SYSTEM | ||
68 | +include_directories( | ||
69 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
70 | ) | ||
71 | |||
72 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | ||
73 | index d83a2e77..401246f4 100644 | ||
74 | --- a/Source/WebKit/PlatformGTK.cmake | ||
75 | +++ b/Source/WebKit/PlatformGTK.cmake | ||
76 | @@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
77 | target_include_directories(WebKitPluginProcess2 PRIVATE | ||
78 | ${WebKit2CommonIncludeDirectories} | ||
79 | ) | ||
80 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE | ||
81 | + target_include_directories(WebKitPluginProcess2 PRIVATE | ||
82 | ${WebKit2CommonSystemIncludeDirectories} | ||
83 | ${GTK2_INCLUDE_DIRS} | ||
84 | ${GDK2_INCLUDE_DIRS} | ||
85 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake | ||
86 | index 7bc89543..d9818fa4 100644 | ||
87 | --- a/Source/cmake/WebKitMacros.cmake | ||
88 | +++ b/Source/cmake/WebKitMacros.cmake | ||
89 | @@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target) | ||
90 | endmacro() | ||
91 | |||
92 | macro(WEBKIT_FRAMEWORK _target) | ||
93 | - include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
94 | + include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
95 | target_sources(${_target} PRIVATE | ||
96 | ${${_target}_HEADERS} | ||
97 | ${${_target}_SOURCES} | ||
98 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
99 | index e832a86d..ce92c864 100644 | ||
100 | --- a/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
101 | +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
102 | @@ -57,7 +57,7 @@ endif () | ||
103 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) | ||
104 | |||
105 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) | ||
106 | -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
107 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
108 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) | ||
109 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | ||
110 | |||
111 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
112 | index 1be3dd52..7bdddf37 100644 | ||
113 | --- a/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
114 | +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
115 | @@ -20,7 +20,7 @@ include_directories( | ||
116 | ${WEBKIT2_DIR}/UIProcess/API/gtk | ||
117 | ) | ||
118 | |||
119 | -include_directories(SYSTEM | ||
120 | +include_directories( | ||
121 | ${GDK3_INCLUDE_DIRS} | ||
122 | ${GLIB_INCLUDE_DIRS} | ||
123 | ${GTK3_INCLUDE_DIRS} | ||
124 | -- | ||
125 | 2.14.1 | ||
126 | |||