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 | 52 |
1 files changed, 25 insertions, 27 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 index 9fc1421fdd..034219f826 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001 | 1 | From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 | 3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 |
4 | Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem | 4 | Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem |
5 | 5 | ||
6 | gcc-6 has now introduced stdlib.h in libstdc++ for better | 6 | gcc-6 has now introduced stdlib.h in libstdc++ for better |
7 | compliance and its including the C library stdlib.h using | 7 | compliance and its including the C library stdlib.h using |
@@ -17,6 +17,7 @@ and ends up with compile errors e.g. | |||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
18 | 18 | ||
19 | Upstream-Status: Pending | 19 | Upstream-Status: Pending |
20 | |||
20 | --- | 21 | --- |
21 | Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- | 22 | Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- |
22 | Source/WebCore/PlatformGTK.cmake | 6 +++--- | 23 | Source/WebCore/PlatformGTK.cmake | 6 +++--- |
@@ -27,23 +28,23 @@ Upstream-Status: Pending | |||
27 | 6 files changed, 8 insertions(+), 8 deletions(-) | 28 | 6 files changed, 8 insertions(+), 8 deletions(-) |
28 | 29 | ||
29 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt | 30 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt |
30 | index bc37dd31..4e49871f 100644 | 31 | index b3c7e0b..88446de 100644 |
31 | --- a/Source/JavaScriptCore/shell/CMakeLists.txt | 32 | --- a/Source/JavaScriptCore/shell/CMakeLists.txt |
32 | +++ b/Source/JavaScriptCore/shell/CMakeLists.txt | 33 | +++ b/Source/JavaScriptCore/shell/CMakeLists.txt |
33 | @@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | 34 | @@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() |
34 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) | 35 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) |
35 | WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) | 36 | WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) |
36 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) | 37 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}) |
37 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | 38 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
38 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | 39 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
39 | add_executable(jsc ${JSC_SOURCES}) | 40 | add_executable(jsc ${JSC_SOURCES}) |
40 | target_link_libraries(jsc ${JSC_LIBRARIES}) | 41 | target_link_libraries(jsc ${JSC_LIBRARIES}) |
41 | 42 | ||
42 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake | 43 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake |
43 | index 73506c74..8eb8b415 100644 | 44 | index 32c6ccc..fef5e8b 100644 |
44 | --- a/Source/WebCore/PlatformGTK.cmake | 45 | --- a/Source/WebCore/PlatformGTK.cmake |
45 | +++ b/Source/WebCore/PlatformGTK.cmake | 46 | +++ b/Source/WebCore/PlatformGTK.cmake |
46 | @@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | 47 | @@ -159,7 +159,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) |
47 | ${GTK2_INCLUDE_DIRS} | 48 | ${GTK2_INCLUDE_DIRS} |
48 | ${GDK2_INCLUDE_DIRS} | 49 | ${GDK2_INCLUDE_DIRS} |
49 | ) | 50 | ) |
@@ -52,7 +53,7 @@ index 73506c74..8eb8b415 100644 | |||
52 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | 53 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
53 | ) | 54 | ) |
54 | target_link_libraries(WebCorePlatformGTK2 | 55 | target_link_libraries(WebCorePlatformGTK2 |
55 | @@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore) | 56 | @@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore) |
56 | target_include_directories(WebCorePlatformGTK PRIVATE | 57 | target_include_directories(WebCorePlatformGTK PRIVATE |
57 | ${WebCore_INCLUDE_DIRECTORIES} | 58 | ${WebCore_INCLUDE_DIRECTORIES} |
58 | ) | 59 | ) |
@@ -61,7 +62,7 @@ index 73506c74..8eb8b415 100644 | |||
61 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | 62 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
62 | ${GTK_INCLUDE_DIRS} | 63 | ${GTK_INCLUDE_DIRS} |
63 | ${GDK_INCLUDE_DIRS} | 64 | ${GDK_INCLUDE_DIRS} |
64 | @@ -321,7 +321,7 @@ include_directories( | 65 | @@ -199,7 +199,7 @@ include_directories( |
65 | "${WEBCORE_DIR}/bindings/gobject/" | 66 | "${WEBCORE_DIR}/bindings/gobject/" |
66 | ) | 67 | ) |
67 | 68 | ||
@@ -71,33 +72,33 @@ index 73506c74..8eb8b415 100644 | |||
71 | ) | 72 | ) |
72 | 73 | ||
73 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | 74 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
74 | index d83a2e77..401246f4 100644 | 75 | index 8c6ebb5..772c243 100644 |
75 | --- a/Source/WebKit/PlatformGTK.cmake | 76 | --- a/Source/WebKit/PlatformGTK.cmake |
76 | +++ b/Source/WebKit/PlatformGTK.cmake | 77 | +++ b/Source/WebKit/PlatformGTK.cmake |
77 | @@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | 78 | @@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) |
78 | target_include_directories(WebKitPluginProcess2 PRIVATE | 79 | target_include_directories(WebKitPluginProcess2 PRIVATE |
79 | ${WebKit2CommonIncludeDirectories} | 80 | ${WebKitCommonIncludeDirectories} |
80 | ) | 81 | ) |
81 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE | 82 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE |
82 | + target_include_directories(WebKitPluginProcess2 PRIVATE | 83 | + target_include_directories(WebKitPluginProcess2 PRIVATE |
83 | ${WebKit2CommonSystemIncludeDirectories} | 84 | ${WebKitCommonSystemIncludeDirectories} |
84 | ${GTK2_INCLUDE_DIRS} | 85 | ${GTK2_INCLUDE_DIRS} |
85 | ${GDK2_INCLUDE_DIRS} | 86 | ${GDK2_INCLUDE_DIRS} |
86 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake | 87 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake |
87 | index 7bc89543..d9818fa4 100644 | 88 | index a1e7e8f..ce24274 100644 |
88 | --- a/Source/cmake/WebKitMacros.cmake | 89 | --- a/Source/cmake/WebKitMacros.cmake |
89 | +++ b/Source/cmake/WebKitMacros.cmake | 90 | +++ b/Source/cmake/WebKitMacros.cmake |
90 | @@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target) | 91 | @@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target) |
91 | endmacro() | ||
92 | |||
93 | macro(WEBKIT_FRAMEWORK _target) | ||
94 | - include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
95 | + include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
96 | target_sources(${_target} PRIVATE | ||
97 | ${${_target}_HEADERS} | ||
98 | ${${_target}_SOURCES} | 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}") | ||
99 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt | 100 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt |
100 | index e832a86d..ce92c864 100644 | 101 | index dc2b61e..0128dca 100644 |
101 | --- a/Tools/MiniBrowser/gtk/CMakeLists.txt | 102 | --- a/Tools/MiniBrowser/gtk/CMakeLists.txt |
102 | +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt | 103 | +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt |
103 | @@ -57,7 +57,7 @@ endif () | 104 | @@ -57,7 +57,7 @@ endif () |
@@ -110,11 +111,11 @@ index e832a86d..ce92c864 100644 | |||
110 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | 111 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) |
111 | 112 | ||
112 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake | 113 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake |
113 | index 1be3dd52..7bdddf37 100644 | 114 | index 4aef695..a14b163 100644 |
114 | --- a/Tools/TestWebKitAPI/PlatformGTK.cmake | 115 | --- a/Tools/TestWebKitAPI/PlatformGTK.cmake |
115 | +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake | 116 | +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake |
116 | @@ -20,7 +20,7 @@ include_directories( | 117 | @@ -20,7 +20,7 @@ include_directories( |
117 | ${WEBKIT2_DIR}/UIProcess/API/gtk | 118 | ${WEBKIT_DIR}/UIProcess/API/gtk |
118 | ) | 119 | ) |
119 | 120 | ||
120 | -include_directories(SYSTEM | 121 | -include_directories(SYSTEM |
@@ -122,6 +123,3 @@ index 1be3dd52..7bdddf37 100644 | |||
122 | ${GDK3_INCLUDE_DIRS} | 123 | ${GDK3_INCLUDE_DIRS} |
123 | ${GLIB_INCLUDE_DIRS} | 124 | ${GLIB_INCLUDE_DIRS} |
124 | ${GTK3_INCLUDE_DIRS} | 125 | ${GTK3_INCLUDE_DIRS} |
125 | -- | ||
126 | 2.14.1 | ||
127 | |||