diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch index 615fe4f402..896890b433 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 | 1 | From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 | 3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 |
4 | Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir | 4 | Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | Source/WebKit2/PlatformGTK.cmake | 9 +++++---- | 10 | Source/WebKit/PlatformGTK.cmake | 9 +++++---- |
10 | 1 file changed, 5 insertions(+), 4 deletions(-) | 11 | 1 file changed, 5 insertions(+), 4 deletions(-) |
11 | 12 | ||
12 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake | 13 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
13 | index adaa010..f18cf8a 100644 | 14 | index a33c6a86..d83a2e77 100644 |
14 | --- a/Source/WebKit2/PlatformGTK.cmake | 15 | --- a/Source/WebKit/PlatformGTK.cmake |
15 | +++ b/Source/WebKit2/PlatformGTK.cmake | 16 | +++ b/Source/WebKit/PlatformGTK.cmake |
16 | @@ -906,8 +906,9 @@ endif () | 17 | @@ -1122,8 +1122,9 @@ endif () |
17 | string(REGEX MATCHALL "-L[^ ]*" | 18 | string(REGEX MATCHALL "-L[^ ]*" |
18 | INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") | 19 | INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") |
19 | 20 | ||
@@ -25,7 +26,7 @@ index adaa010..f18cf8a 100644 | |||
25 | DEPENDS WebKit2 | 26 | DEPENDS WebKit2 |
26 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 27 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
27 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | 28 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= |
28 | @@ -950,7 +951,7 @@ add_custom_command( | 29 | @@ -1168,7 +1169,7 @@ add_custom_command( |
29 | add_custom_command( | 30 | add_custom_command( |
30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
@@ -34,7 +35,7 @@ index adaa010..f18cf8a 100644 | |||
34 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | 35 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} |
35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | 36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
36 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
37 | @@ -1004,7 +1005,7 @@ add_custom_command( | 38 | @@ -1225,7 +1226,7 @@ add_custom_command( |
38 | 39 | ||
39 | add_custom_command( | 40 | add_custom_command( |
40 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | 41 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib |
@@ -44,5 +45,5 @@ index adaa010..f18cf8a 100644 | |||
44 | ) | 45 | ) |
45 | 46 | ||
46 | -- | 47 | -- |
47 | 2.9.3 | 48 | 2.14.1 |
48 | 49 | ||