Signed-off-by: Alexander Kanavin <[email protected]> --- ...ency-for-g-ir-compiler-for-building-.patch | 33 +++++++++++++++++++ .../gobject-introspection_1.64.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch new file mode 100644 index 0000000000..adb357b5ec --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch @@ -0,0 +1,33 @@ +From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 17 Jun 2020 11:43:16 +0200 +Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs + +meson inserts the dependency if the compiler is used directly, but +fails to do so if the compiler is run through a wrapper. This leads +to build race errors between building the compiler and using it. + +Fix provided by Quentin Schulz <[email protected]> + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + gir/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gir/meson.build b/gir/meson.build +index b37fdb81..557e5517 100644 +--- a/gir/meson.build ++++ b/gir/meson.build +@@ -448,7 +448,7 @@ foreach gir : gir_files + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@[email protected]', +- depends: [gobject_gir, ], ++ depends: [gobject_gir, gircompiler, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +-- +2.27.0 + diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb index 9dfb55e055..7eefdd3e27 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ + file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \ " SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b" -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139594): https://lists.openembedded.org/g/openembedded-core/message/139594 Mute This Topic: https://lists.openembedded.org/mt/74934569/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
