mirror of
https://git.yoctoproject.org/poky
synced 2026-03-24 16:02:20 +01:00
bfeeefa597
Remove the previous attempt at this from 0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch as it wasn't quite right, and the rest of the patch is adding the currently not upstreamable runner option. Add two new patches to fix both gobject-introspection and gtk-doc using native flags for target compiles. (From OE-Core rev: bf41247f52ffd40d91d94d1fc983f8a831b80e48) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
Ensure that in a cross compile only the target flags are passed to gtk-doc, and
|
|
not the native flags.
|
|
|
|
Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/4261]
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
|
|
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
|
index 4af33304..8751f53c 100644
|
|
--- a/mesonbuild/modules/gnome.py
|
|
+++ b/mesonbuild/modules/gnome.py
|
|
@@ -851,17 +851,30 @@ This will become a hard error in the future.''')
|
|
if not isinstance(incd.held_object, (str, build.IncludeDirs)):
|
|
raise MesonException(
|
|
'Gir include dirs should be include_directories().')
|
|
+
|
|
cflags.update(get_include_args(inc_dirs))
|
|
- cflags.update(state.environment.coredata.get_external_args('c'))
|
|
+ if state.environment.is_cross_build():
|
|
+ cflags.update(state.environment.cross_info.config["properties"].get('c_args', ""))
|
|
+ else:
|
|
+ cflags.update(state.environment.coredata.get_external_args('c'))
|
|
+
|
|
ldflags = OrderedSet()
|
|
ldflags.update(internal_ldflags)
|
|
- ldflags.update(state.environment.coredata.get_external_link_args('c'))
|
|
+ if state.environment.is_cross_build():
|
|
+ ldflags.update(state.environment.cross_info.config["properties"].get('c_link_args', ""))
|
|
+ else:
|
|
+ ldflags.update(state.environment.coredata.get_external_link_args('c'))
|
|
ldflags.update(external_ldflags)
|
|
+
|
|
if cflags:
|
|
args += ['--cflags=%s' % ' '.join(cflags)]
|
|
if ldflags:
|
|
args += ['--ldflags=%s' % ' '.join(ldflags)]
|
|
- compiler = state.environment.coredata.compilers.get('c')
|
|
+
|
|
+ if state.environment.is_cross_build():
|
|
+ compiler = state.environment.coredata.cross_compilers.get('c')
|
|
+ else:
|
|
+ compiler = state.environment.coredata.compilers.get('c')
|
|
if compiler:
|
|
args += ['--cc=%s' % ' '.join(compiler.get_exelist())]
|
|
args += ['--ld=%s' % ' '.join(compiler.get_linker_exelist())]
|