diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch index 923d00c4ba..3e03aa968c 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f9767a479111f9c6f280c43176c33de50aee7f66 Mon Sep 17 00:00:00 2001 | 1 | From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 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: Wed, 28 Oct 2015 14:18:57 +0200 | 3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 |
4 | Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the | 4 | Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the |
@@ -11,14 +11,28 @@ Upstream-Status: Pending [review on oe-core list] | |||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | 12 | ||
13 | --- | 13 | --- |
14 | Source/WebKit/PlatformGTK.cmake | 4 ++-- | 14 | Source/JavaScriptCore/PlatformGTK.cmake | 2 +- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | Source/WebKit/PlatformGTK.cmake | 4 ++-- |
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
16 | 17 | ||
18 | diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake | ||
19 | index 0b2968d2..2742ad80 100644 | ||
20 | --- a/Source/JavaScriptCore/PlatformGTK.cmake | ||
21 | +++ b/Source/JavaScriptCore/PlatformGTK.cmake | ||
22 | @@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) | ||
23 | add_custom_command( | ||
24 | OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
25 | DEPENDS JavaScriptCore | ||
26 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= | ||
27 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
28 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
29 | ${INTROSPECTION_SCANNER} | ||
30 | --quiet | ||
17 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | 31 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
18 | index dc6b306..a074a80 100644 | 32 | index e36e4c35..943f9794 100644 |
19 | --- a/Source/WebKit/PlatformGTK.cmake | 33 | --- a/Source/WebKit/PlatformGTK.cmake |
20 | +++ b/Source/WebKit/PlatformGTK.cmake | 34 | +++ b/Source/WebKit/PlatformGTK.cmake |
21 | @@ -732,7 +732,7 @@ if (ENABLE_INTROSPECTION) | 35 | @@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION) |
22 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 36 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
23 | DEPENDS WebKit | 37 | DEPENDS WebKit |
24 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 38 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
@@ -27,7 +41,7 @@ index dc6b306..a074a80 100644 | |||
27 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 41 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
28 | ${INTROSPECTION_SCANNER} | 42 | ${INTROSPECTION_SCANNER} |
29 | --quiet | 43 | --quiet |
30 | @@ -774,7 +774,7 @@ if (ENABLE_INTROSPECTION) | 44 | @@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION) |
31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 45 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 46 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
33 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 47 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |