diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-04 14:18:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-04 22:51:49 +0100 |
commit | 9586fcb8a22a27a593f4f93cf0b76291d2486ff3 (patch) | |
tree | bd5a54658a6dcabde1fa99f88e76518027414e18 /meta/recipes-extended/gperf | |
parent | f0ee9008597b08704726c5c140836c2497002711 (diff) | |
download | poky-9586fcb8a22a27a593f4f93cf0b76291d2486ff3.tar.gz |
gperf: Add a patch to work around reproducibility issues
Add a patch to avoid writing the full pathname to gperf into source
files which leads to reproducibility issues.
This fixes issues with systemd reproducibility in particular.
(From OE-Core rev: dea3c7ee2a413f7dc5f13ec006592084f7fb266c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/gperf')
-rw-r--r-- | meta/recipes-extended/gperf/gperf/reproducibility.patch | 26 | ||||
-rw-r--r-- | meta/recipes-extended/gperf/gperf_3.1.bb | 2 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/gperf/gperf/reproducibility.patch b/meta/recipes-extended/gperf/gperf/reproducibility.patch new file mode 100644 index 0000000000..9f80828dbd --- /dev/null +++ b/meta/recipes-extended/gperf/gperf/reproducibility.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | By default gperf puts a header into generated files with the full path to | ||
2 | the tool along with the commandline used. This patch removes the path to | ||
3 | the binary, allowing reproducible source files (which can be included in | ||
4 | debug source packages). | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
8 | |||
9 | Index: gperf-3.1/src/options.cc | ||
10 | =================================================================== | ||
11 | --- gperf-3.1.orig/src/options.cc | ||
12 | +++ gperf-3.1/src/options.cc | ||
13 | @@ -280,6 +280,13 @@ Options::print_options () const | ||
14 | { | ||
15 | const char *arg = _argument_vector[i]; | ||
16 | |||
17 | + if (i == 0) { | ||
18 | + const char *shortarg = strrchr(arg, '/'); | ||
19 | + if (shortarg) { | ||
20 | + arg = shortarg + 1; | ||
21 | + } | ||
22 | + } | ||
23 | + | ||
24 | /* Escape arg if it contains shell metacharacters. */ | ||
25 | if (*arg == '-') | ||
26 | { | ||
diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb b/meta/recipes-extended/gperf/gperf_3.1.bb index 82750fca05..3564ac0805 100644 --- a/meta/recipes-extended/gperf/gperf_3.1.bb +++ b/meta/recipes-extended/gperf/gperf_3.1.bb | |||
@@ -9,6 +9,8 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" | |||
9 | SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" | 9 | SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" |
10 | SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" | 10 | SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" |
11 | 11 | ||
12 | SRC_URI:append = " file://reproducibility.patch" | ||
13 | |||
12 | inherit autotools | 14 | inherit autotools |
13 | 15 | ||
14 | # The nested configures don't find the parent aclocal.m4 out of the box, so tell | 16 | # The nested configures don't find the parent aclocal.m4 out of the box, so tell |