From bf746c2dea3ade181e91ef12d41dfe4286949e1d Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 7 May 2020 09:35:32 -0700 Subject: wget: improve reproducible build Modify DEBUG_PREFIX_MAP as used by sed to handle whitespace correctly. This modifies an existing patch. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- .../wget/wget/0002-improve-reproducibility.patch | 9 +++++++-- 1 file 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 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia + +sed use of DEBUG_PREFIX_MAP must treat whitespace the same as the +echo command building version.c or the expression match will fail. + +Signed-off-by: Joe Slater --- src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) @@ -47,12 +52,12 @@ index 28c0be2..44084a3 100644 echo 'const char *version_string = "@VERSION@";' >> $@ echo 'const char *compilation_string = "'$(COMPILE)'";' \ + | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ -+ -e "s,$(DEBUG_PREFIX_MAP),,g" \ ++ -e "s,$$(echo $(DEBUG_PREFIX_MAP)),,g" \ | $(ESCAPEQUOTE) >> $@ echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \ + | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ -+ -e "s,$(DEBUG_PREFIX_MAP),,g" \ ++ -e "s,$$(echo $(DEBUG_PREFIX_MAP)),,g" \ | $(ESCAPEQUOTE) >> $@ css.c: $(srcdir)/css.l -- cgit 1.2.3-korg