diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2021-12-08 16:13:21 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-12 11:27:23 +0000 |
commit | d2a2b83b2d13e050450b39ef07d50b35a1bc2d93 (patch) | |
tree | 465d4a458da9c5b73ee17f65f635babf3f8727ba /meta/recipes-gnome/libhandy | |
parent | e6cc1b4245c7f34a0411a9ee2855fb6fae20d01c (diff) | |
download | poky-d2a2b83b2d13e050450b39ef07d50b35a1bc2d93.tar.gz |
libhandy: Backport a makefile header race
After the commit(8157ecc Separate public and private enums) introduced,
there comes a race as below:
| In file included from ../git/src/hdy-settings.c:11:
| ../git/src/hdy-settings-private.h:16:10: fatal error: hdy-enums-private.h: No such file or directory
| 16 | #include "hdy-enums-private.h"
So also add private headers like private sources did now to libhandy_sources
to fix the issue.
(From OE-Core rev: de57b4624e3d2d66268c33c4bf86dcb25abcab32)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/libhandy')
-rw-r--r-- | meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch | 37 | ||||
-rw-r--r-- | meta/recipes-gnome/libhandy/libhandy_1.5.0.bb | 4 |
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch b/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch new file mode 100644 index 0000000000..7b2a512738 --- /dev/null +++ b/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From e7c3e8fa00f6a68b2e0629db5ee115e641ea710e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Wed, 8 Dec 2021 07:35:52 +0000 | ||
4 | Subject: [PATCH] Add private headers | ||
5 | |||
6 | After the commit(8157ecc Separate public and private enums) introduced, | ||
7 | there comes a race as below: | ||
8 | | In file included from ../git/src/hdy-settings.c:11: | ||
9 | | ../git/src/hdy-settings-private.h:16:10: fatal error: hdy-enums-private.h: No such file or directory | ||
10 | | 16 | #include "hdy-enums-private.h" | ||
11 | |||
12 | So also add private headers like private sources to libhandy_sources to | ||
13 | fix the issue. | ||
14 | |||
15 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/796] | ||
16 | |||
17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
18 | --- | ||
19 | src/meson.build | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/meson.build b/src/meson.build | ||
23 | index d087323..6f11f27 100644 | ||
24 | --- a/src/meson.build | ||
25 | +++ b/src/meson.build | ||
26 | @@ -64,7 +64,7 @@ hdy_private_enums = gnome.mkenums('hdy-enums-private', | ||
27 | ) | ||
28 | |||
29 | libhandy_public_sources += [hdy_public_enums[0]] | ||
30 | -libhandy_private_sources += [hdy_private_enums[0]] | ||
31 | +libhandy_private_sources += hdy_private_enums | ||
32 | libhandy_generated_headers += [hdy_public_enums[1]] | ||
33 | |||
34 | src_headers = [ | ||
35 | -- | ||
36 | 2.32.0 | ||
37 | |||
diff --git a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb b/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb index d0b59b1a62..605ef2b5fa 100644 --- a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb +++ b/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb | |||
@@ -9,7 +9,9 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" | |||
9 | LICENSE = "LGPLv2.1" | 9 | LICENSE = "LGPLv2.1" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
11 | 11 | ||
12 | SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master" | 12 | SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master \ |
13 | file://0001-Add-private-headers.patch \ | ||
14 | " | ||
13 | SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab" | 15 | SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab" |
14 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
15 | 17 | ||