mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

gcr: fix one parallel build failure

Browse Source 
ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing
dependency, following error occurred intermittently during doing parallel
build:

 -o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c ../gcr-3.38.1/ui/gcr-live-search.c
../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No such file or directory
   32 | #include "gcr/gcr-marshal.h"
      |          ^~~~~~~~~~~~~~~~~~~
compilation terminated.

(From OE-Core rev: a6690c22952a315e6c6734a5936d9eb18e1b3004)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changqing Li
2021-04-23 17:43:07 +08:00
committed by Richard Purdie
parent 7d228861e8
commit 770532164f
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch Normal file
View File

@@ -0,0 +1,37 @@
From cb3708bad88e713e4ccf705cb8c14c5996cd9d06 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Fri, 23 Apr 2021 16:32:38 +0800
Subject: [PATCH] gcr/meson.build: fix one parallel build failure
ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing
dependency, following error occurred intermittently during doing parallel
build:
-o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c ../gcr-3.38.1/ui/gcr-live-search.c
../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No such file or directory
32 | #include "gcr/gcr-marshal.h"
| ^~~~~~~~~~~~~~~~~~~
compilation terminated.
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/68/diffs]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
gcr/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/gcr/meson.build b/gcr/meson.build
index 06c3a63..d9d4b8f 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -181,6 +181,7 @@ gcr_base_dep = declare_dependency(
sources: [
gcr_enums_gen[1],
gcr_oids[1],
+ gcr_marshal_gen[1],
],
)
--
2.17.1

2
meta/recipes-gnome/gcr/gcr_3.40.0.bb
View File

@@ -17,6 +17,8 @@ GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch"
SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}"