| Andrew Geissler | 1548c07 | 2019-02-22 16:03:50 -0600 | [diff] [blame] | 1 | From 133ab27cdb17ca20ef6b0304cf30621d2bcbe757 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Thu, 31 Jan 2019 21:32:26 -0800 |
| 4 | Subject: [PATCH] src/Makefile: improve reproducibility |
| 5 | |
| 6 | Clear all_cflags, all_lflags, compiled_user |
| 7 | and compiled_sys to avoid introducing build |
| 8 | info to improve reproducibility as below: |
| 9 | |
| 10 | WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths] |
| 11 | |
| 12 | Upstream-Status: Inappropriate [oe specific] |
| 13 | |
| 14 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 15 | --- |
| 16 | src/Makefile | 14 ++++---------- |
| 17 | 1 file changed, 4 insertions(+), 10 deletions(-) |
| 18 | |
| 19 | diff --git a/src/Makefile b/src/Makefile |
| 20 | index f2fafa4dc..7148d4bd9 100644 |
| 21 | --- a/src/Makefile |
| 22 | +++ b/src/Makefile |
| 23 | @@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk |
| 24 | -@echo '#include "vim.h"' >> $@ |
| 25 | -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ |
| 26 | -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ |
| 27 | - -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ |
| 28 | - -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ |
| 29 | - -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ |
| 30 | - -@if test -n "$(COMPILEDBY)"; then \ |
| 31 | - echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ |
| 32 | - else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi |
| 33 | - -@echo '";' >> $@ |
| 34 | - -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@ |
| 35 | - -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi |
| 36 | - -@echo '";' >> $@ |
| 37 | + -@echo 'char_u *all_cflags = (char_u *)"";' | $(QUOTESED) >> $@ |
| 38 | + -@echo 'char_u *all_lflags = (char_u *)"";' | $(QUOTESED) >> $@ |
| 39 | + -@echo 'char_u *compiled_user = (char_u *)"";' >> $@ |
| 40 | + -@echo 'char_u *compiled_sys = (char_u *)"";' >> $@ |
| 41 | -@sh $(srcdir)/pathdef.sh |
| 42 | |
| 43 | GUI_GTK_RES_INPUTS = \ |
| 44 | -- |
| 45 | 2.17.1 |
| 46 | |