| From 89ac299e0d9436f1effaa07711458d616574cc8f Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex@linutronix.de> |
| Date: Mon, 4 Apr 2022 21:20:05 +0200 |
| Subject: [PATCH] Propagate CFLAGS to introspection targets |
| |
| Otherwise, important things do not get passed to the compiler in cross compiling with a sysroot scenario: |
| |
| 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, |
| 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, |
| 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, |
| 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, |
| 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, |
| 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, |
| 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: |
| /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 |
| 203 | #include_next <limits.h> /* recurse down to the real one */ |
| | ^ |
| In 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, |
| 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, |
| 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: |
| /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 |
| 35 | #include <time.h> |
| | ^~~~~~~~ |
| compilation terminated. |
| Traceback (most recent call last): |
| 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 |
| self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
| 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 |
| spawn(cmd, dry_run=self.dry_run) |
| 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 |
| raise DistutilsExecError( |
| 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 |
| |
| Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/8290] |
| Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| |
| |
| Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| --- |
| Source/cmake/FindGI.cmake | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake |
| index b3e810cd..e22a75f7 100644 |
| --- a/Source/cmake/FindGI.cmake |
| +++ b/Source/cmake/FindGI.cmake |
| @@ -340,7 +340,7 @@ function(GI_INTROSPECT namespace nsversion header) |
| DEPENDS ${gir_deps} ${gir_srcs} |
| VERBATIM |
| COMMAND_EXPAND_LISTS |
| - COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" |
| + COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS}" |
| "${GI_SCANNER_EXE}" --quiet --warn-all --warn-error --no-libtool |
| "--output=${gir_path}" |
| "--library=$<TARGET_FILE_BASE_NAME:${opt_TARGET}>" |