MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wget: improve reproducible build

Browse Source 
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>
This commit is contained in:
Joe Slater 2020-05-07 09:35:32 -07:00 committed by Richard Purdie
parent ded978ea62
commit e8fd72ee7c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
View File

@ -34,6 +34,11 @@ Link: gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
Upstream-Status: Inappropriate [oe-core specific] Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
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 <jslater@windriver.com>
--- ---
src/Makefile.am | 4 ++++ src/Makefile.am | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
@ -47,12 +52,12 @@ index 28c0be2..44084a3 100644
echo 'const char *version_string = "@VERSION@";' >> $@ echo 'const char *version_string = "@VERSION@";' >> $@
echo 'const char *compilation_string = "'$(COMPILE)'";' \ echo 'const char *compilation_string = "'$(COMPILE)'";' \
+ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ + | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \
+ -e "s,$(DEBUG_PREFIX_MAP),,g" \ + -e "s,$$(echo $(DEBUG_PREFIX_MAP)),,g" \
| $(ESCAPEQUOTE) >> $@ | $(ESCAPEQUOTE) >> $@
echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \ echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \ $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \
+ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ + | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \
+ -e "s,$(DEBUG_PREFIX_MAP),,g" \ + -e "s,$$(echo $(DEBUG_PREFIX_MAP)),,g" \
| $(ESCAPEQUOTE) >> $@ | $(ESCAPEQUOTE) >> $@
css.c: $(srcdir)/css.l css.c: $(srcdir)/css.l