diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-09 17:02:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:45 +0000 |
commit | 8b1fa2acd19ac6c0587f9eba9eae9818f07a25af (patch) | |
tree | 67f104a6d2f1f4410308fe8168a8124f43d41118 /meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | |
parent | 7bd32b9ce6436315d6e44e186aeeb4bb8708559c (diff) | |
download | poky-8b1fa2acd19ac6c0587f9eba9eae9818f07a25af.tar.gz |
webkitgtk: enable gobject introspection
(From OE-Core rev: cfd1ccb615a1196f4501f8fea29060a9e0b599f5)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch')
-rw-r--r-- | meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch new file mode 100644 index 0000000000..44b43cdbba --- /dev/null +++ b/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 | ||
4 | Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the | ||
5 | compiler flags. | ||
6 | |||
7 | g-ir-compiler is using a C compiler internally, so it needs to set | ||
8 | the proper flags for it. | ||
9 | |||
10 | Upstream-Status: Pending [review on oe-core list] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | Source/WebKit2/PlatformGTK.cmake | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake | ||
17 | index 706f1e8..14a1c3b 100644 | ||
18 | --- a/Source/WebKit2/PlatformGTK.cmake | ||
19 | +++ b/Source/WebKit2/PlatformGTK.cmake | ||
20 | @@ -884,7 +884,7 @@ add_custom_command( | ||
21 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
22 | DEPENDS WebKit2 | ||
23 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
24 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= | ||
25 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
26 | LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
27 | ${INTROSPECTION_SCANNER} | ||
28 | --quiet | ||
29 | @@ -930,7 +930,7 @@ add_custom_command( | ||
30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | ||
31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
32 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
33 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations | ||
34 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | ||
35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | ||
36 | LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
37 | ${INTROSPECTION_SCANNER} | ||
38 | -- | ||
39 | 2.6.4 | ||
40 | |||