38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
|
From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
Date: Wed, 28 Oct 2015 14:18:57 +0200
|
||
|
|
Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
|
||
|
|
compiler flags.
|
||
|
|
|
||
|
|
g-ir-compiler is using a C compiler internally, so it needs to set
|
||
|
|
the proper flags for it.
|
||
|
|
|
||
|
|
Upstream-Status: Pending [review on oe-core list]
|
||
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
---
|
||
|
|
Source/WebKit2/PlatformGTK.cmake | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
|
||
|
|
===================================================================
|
||
|
|
--- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake
|
||
|
|
+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
|
||
|
|
@@ -910,7 +910,7 @@ add_custom_command(
|
||
|
|
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||
|
|
DEPENDS WebKit2
|
||
|
|
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||
|
|
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
|
||
|
|
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
|
||
|
|
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||
|
|
${INTROSPECTION_SCANNER}
|
||
|
|
--quiet
|
||
|
|
@@ -951,7 +951,7 @@ add_custom_command(
|
||
|
|
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
|
||
|
|
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||
|
|
DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||
|
|
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
|
||
|
|
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
|
||
|
|
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
|
||
|
|
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||
|
|
${INTROSPECTION_SCANNER}
|