summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2020-05-07 09:35:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-09 18:57:21 +0100
commite8fd72ee7cce054046ab7bb373ce10d2e8fd42d0 (patch)
tree6870d06272b800f6883b03e7678a57d537aa8d75 /meta/recipes-extended
parentded978ea623cec9304a773b05e7cb5350d3789ed (diff)
downloadpoky-e8fd72ee7cce054046ab7bb373ce10d2e8fd42d0.tar.gz
wget: improve reproducible build
Modify DEBUG_PREFIX_MAP as used by sed to handle whitespace correctly. This modifies an existing patch. (From OE-Core rev: bf746c2dea3ade181e91ef12d41dfe4286949e1d) Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
index 8781df21c0..050fc2c7e1 100644
--- a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
+++ b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
@@ -34,6 +34,11 @@ Link: gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
34Upstream-Status: Inappropriate [oe-core specific] 34Upstream-Status: Inappropriate [oe-core specific]
35 35
36Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 36Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
37
38sed use of DEBUG_PREFIX_MAP must treat whitespace the same as the
39echo command building version.c or the expression match will fail.
40
41Signed-off-by: Joe Slater <jslater@windriver.com>
37--- 42---
38 src/Makefile.am | 4 ++++ 43 src/Makefile.am | 4 ++++
39 1 file changed, 4 insertions(+) 44 1 file changed, 4 insertions(+)
@@ -47,12 +52,12 @@ index 28c0be2..44084a3 100644
47 echo 'const char *version_string = "@VERSION@";' >> $@ 52 echo 'const char *version_string = "@VERSION@";' >> $@
48 echo 'const char *compilation_string = "'$(COMPILE)'";' \ 53 echo 'const char *compilation_string = "'$(COMPILE)'";' \
49+ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ 54+ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \
50+ -e "s,$(DEBUG_PREFIX_MAP),,g" \ 55+ -e "s,$$(echo $(DEBUG_PREFIX_MAP)),,g" \
51 | $(ESCAPEQUOTE) >> $@ 56 | $(ESCAPEQUOTE) >> $@
52 echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 57 echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
53 $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \ 58 $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \
54+ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ 59+ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \
55+ -e "s,$(DEBUG_PREFIX_MAP),,g" \ 60+ -e "s,$$(echo $(DEBUG_PREFIX_MAP)),,g" \
56 | $(ESCAPEQUOTE) >> $@ 61 | $(ESCAPEQUOTE) >> $@
57 62
58 css.c: $(srcdir)/css.l 63 css.c: $(srcdir)/css.l