1*4882a593SmuzhiyunFrom 01f5ab0edf3dd8f76d37fd36c2dcd3108be33a7b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alexander Kanavin <alex@linutronix.de> 3*4882a593SmuzhiyunDate: Mon, 4 Apr 2022 21:20:05 +0200 4*4882a593SmuzhiyunSubject: [PATCH] When building introspection files, do not quote CFLAGS. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis does not seem to be propagated to the compiler correctly: 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunIn 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*4882a593Smuzhiyun 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, 10*4882a593Smuzhiyun from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/lib/glib-2.0/include/glibconfig.h:11, 11*4882a593Smuzhiyun from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:32, 12*4882a593Smuzhiyun from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32, 13*4882a593Smuzhiyun from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30, 14*4882a593Smuzhiyun from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2: 15*4882a593Smuzhiyun/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:203:75: error: no include path in which to search for limits.h 16*4882a593Smuzhiyun 203 | #include_next <limits.h> /* recurse down to the real one */ 17*4882a593Smuzhiyun | ^ 18*4882a593SmuzhiyunIn file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32, 19*4882a593Smuzhiyun from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30, 20*4882a593Smuzhiyun from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2: 21*4882a593Smuzhiyun/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:35:10: fatal error: time.h: No such file or directory 22*4882a593Smuzhiyun 35 | #include <time.h> 23*4882a593Smuzhiyun | ^~~~~~~~ 24*4882a593Smuzhiyuncompilation terminated. 25*4882a593SmuzhiyunTraceback (most recent call last): 26*4882a593Smuzhiyun File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/unixccompiler.py", line 117, in _compile 27*4882a593Smuzhiyun self.spawn(compiler_so + cc_args + [src, '-o', obj] + 28*4882a593Smuzhiyun File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/ccompiler.py", line 910, in spawn 29*4882a593Smuzhiyun spawn(cmd, dry_run=self.dry_run) 30*4882a593Smuzhiyun File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/spawn.py", line 91, in spawn 31*4882a593Smuzhiyun raise DistutilsExecError( 32*4882a593Smuzhiyundistutils.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*4882a593Smuzhiyun 34*4882a593SmuzhiyunUpstream-Status: Inappropriate [upstream has rewritten the whole thing as of https://github.com/WebKit/WebKit/commit/b0ae032850bb6b2672051bab8032fc9f9ef5eb97] 35*4882a593SmuzhiyunSigned-off-by: Alexander Kanavin <alex@linutronix.de> 36*4882a593Smuzhiyun--- 37*4882a593Smuzhiyun Source/JavaScriptCore/PlatformGTK.cmake | 2 +- 38*4882a593Smuzhiyun Source/WebKit/PlatformGTK.cmake | 4 ++-- 39*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 3 deletions(-) 40*4882a593Smuzhiyun 41*4882a593Smuzhiyundiff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake 42*4882a593Smuzhiyunindex 1c3c8fb7..efd18807 100644 43*4882a593Smuzhiyun--- a/Source/JavaScriptCore/PlatformGTK.cmake 44*4882a593Smuzhiyun+++ b/Source/JavaScriptCore/PlatformGTK.cmake 45*4882a593Smuzhiyun@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) 46*4882a593Smuzhiyun add_custom_command( 47*4882a593Smuzhiyun OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 48*4882a593Smuzhiyun DEPENDS JavaScriptCore 49*4882a593Smuzhiyun- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS= 50*4882a593Smuzhiyun+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= 51*4882a593Smuzhiyun ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 52*4882a593Smuzhiyun ${INTROSPECTION_SCANNER} 53*4882a593Smuzhiyun --quiet 54*4882a593Smuzhiyundiff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake 55*4882a593Smuzhiyunindex 48d1820d..ded05035 100644 56*4882a593Smuzhiyun--- a/Source/WebKit/PlatformGTK.cmake 57*4882a593Smuzhiyun+++ b/Source/WebKit/PlatformGTK.cmake 58*4882a593Smuzhiyun@@ -675,7 +675,7 @@ if (ENABLE_INTROSPECTION) 59*4882a593Smuzhiyun add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir 60*4882a593Smuzhiyun DEPENDS WebKit 61*4882a593Smuzhiyun DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 62*4882a593Smuzhiyun- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS= 63*4882a593Smuzhiyun+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= 64*4882a593Smuzhiyun ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 65*4882a593Smuzhiyun ${INTROSPECTION_SCANNER} 66*4882a593Smuzhiyun --quiet 67*4882a593Smuzhiyun@@ -721,7 +721,7 @@ if (ENABLE_INTROSPECTION) 68*4882a593Smuzhiyun OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir 69*4882a593Smuzhiyun DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 70*4882a593Smuzhiyun DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir 71*4882a593Smuzhiyun- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" 72*4882a593Smuzhiyun+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} 73*4882a593Smuzhiyun LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" 74*4882a593Smuzhiyun ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 75*4882a593Smuzhiyun ${INTROSPECTION_SCANNER} 76*4882a593Smuzhiyun-- 77*4882a593Smuzhiyun2.30.2 78*4882a593Smuzhiyun 79