diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch | 67 |
1 files changed, 22 insertions, 45 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch index 3d02be9894..4ef0dbfe2f 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch | |||
@@ -1,9 +1,9 @@ | |||
1 | From 01f5ab0edf3dd8f76d37fd36c2dcd3108be33a7b Mon Sep 17 00:00:00 2001 | 1 | From 89ac299e0d9436f1effaa07711458d616574cc8f Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Mon, 4 Apr 2022 21:20:05 +0200 | 3 | Date: Mon, 4 Apr 2022 21:20:05 +0200 |
4 | Subject: [PATCH] When building introspection files, do not quote CFLAGS. | 4 | Subject: [PATCH] Propagate CFLAGS to introspection targets |
5 | 5 | ||
6 | This does not seem to be propagated to the compiler correctly: | 6 | Otherwise, important things do not get passed to the compiler in cross compiling with a sysroot scenario: |
7 | 7 | ||
8 | In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/syslimits.h:7, | 8 | In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/syslimits.h:7, |
9 | from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:34, | 9 | from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:34, |
@@ -31,48 +31,25 @@ Traceback (most recent call last): | |||
31 | raise DistutilsExecError( | 31 | raise DistutilsExecError( |
32 | distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1 | 32 | distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1 |
33 | 33 | ||
34 | Upstream-Status: Inappropriate [upstream has rewritten the whole thing as of https://github.com/WebKit/WebKit/commit/b0ae032850bb6b2672051bab8032fc9f9ef5eb97] | 34 | Upstream-Status: Pending |
35 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 35 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
36 | --- | ||
37 | Source/JavaScriptCore/PlatformGTK.cmake | 2 +- | ||
38 | Source/WebKit/PlatformGTK.cmake | 4 ++-- | ||
39 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
40 | 36 | ||
41 | diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake | ||
42 | index 1c3c8fb7..efd18807 100644 | ||
43 | --- a/Source/JavaScriptCore/PlatformGTK.cmake | ||
44 | +++ b/Source/JavaScriptCore/PlatformGTK.cmake | ||
45 | @@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) | ||
46 | add_custom_command( | ||
47 | OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
48 | DEPENDS JavaScriptCore | ||
49 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS= | ||
50 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
51 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
52 | ${INTROSPECTION_SCANNER} | ||
53 | --quiet | ||
54 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | ||
55 | index 48d1820d..ded05035 100644 | ||
56 | --- a/Source/WebKit/PlatformGTK.cmake | ||
57 | +++ b/Source/WebKit/PlatformGTK.cmake | ||
58 | @@ -675,7 +675,7 @@ if (ENABLE_INTROSPECTION) | ||
59 | add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
60 | DEPENDS WebKit | ||
61 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
62 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS= | ||
63 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
64 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
65 | ${INTROSPECTION_SCANNER} | ||
66 | --quiet | ||
67 | @@ -721,7 +721,7 @@ if (ENABLE_INTROSPECTION) | ||
68 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | ||
69 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
70 | DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
71 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" | ||
72 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | ||
73 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | ||
74 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
75 | ${INTROSPECTION_SCANNER} | ||
76 | -- | ||
77 | 2.30.2 | ||
78 | 37 | ||
38 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
39 | --- | ||
40 | Source/cmake/FindGI.cmake | 2 +- | ||
41 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
42 | |||
43 | diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake | ||
44 | index b3e810cd..e22a75f7 100644 | ||
45 | --- a/Source/cmake/FindGI.cmake | ||
46 | +++ b/Source/cmake/FindGI.cmake | ||
47 | @@ -340,7 +340,7 @@ function(GI_INTROSPECT namespace nsversion header) | ||
48 | DEPENDS ${gir_deps} ${gir_srcs} | ||
49 | VERBATIM | ||
50 | COMMAND_EXPAND_LISTS | ||
51 | - COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" | ||
52 | + COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS}" | ||
53 | "${GI_SCANNER_EXE}" --quiet --warn-all --warn-error --no-libtool | ||
54 | "--output=${gir_path}" | ||
55 | "--library=$<TARGET_FILE_BASE_NAME:${opt_TARGET}>" | ||