diff options
author | Tom Rini <trini@konsulko.com> | 2019-03-06 15:33:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-06 23:12:27 +0000 |
commit | f08b1e12a024e02ad3d6c1472030f82aa477b076 (patch) | |
tree | 3ec19675c05bd1883fa61105ae896a621112f980 /meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch | |
parent | ccc413fd93f5e7572afd50bbfac8532f07fed9b1 (diff) | |
download | poky-f08b1e12a024e02ad3d6c1472030f82aa477b076.tar.gz |
vim: Import version 8.1.0347
In order to have a stand-alone editor in oe-core, bring in vim from
meta-openembedded/meta-oe. This imports the recipes as of git commit:
commit 41f3f8165bde3eb4f8bcf6dddbaca0d3b760c70b
Author: Mark Hatle <mark.hatle@windriver.com>
Date: Thu Feb 28 09:39:19 2019 +0800
vim: remove xfce vim bbappend
Changing the behavior of a recipe by including a layer is not allowed
by the yocto-check-layer script.
(From OE-Core rev: cc2022ad369a74ee3f60c345778e4fe206f5df36)
Signed-off-by: Tom Rini <trini@konsulko.com>
--
Changes in v3:
- Catch vim-tiny too (thanks Richard!)
Changes in v2:
- List self as maintainer
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch')
-rw-r--r-- | meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch new file mode 100644 index 0000000000..63a7b78f12 --- /dev/null +++ b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch | |||
@@ -0,0 +1,46 @@ | |||
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 | |||