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 | |
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')
3 files changed, 127 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 | |||
diff --git a/meta/recipes-support/vim/files/disable_acl_header_check.patch b/meta/recipes-support/vim/files/disable_acl_header_check.patch new file mode 100644 index 0000000000..4720003c25 --- /dev/null +++ b/meta/recipes-support/vim/files/disable_acl_header_check.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenzong Fan <wenzong.fan@windriver.com> | ||
3 | Date: Tue, 26 Jun 2018 17:29:09 +0800 | ||
4 | Subject: [PATCH] disable acl header check | ||
5 | |||
6 | Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny. | ||
7 | |||
8 | Upstream-Status: pending | ||
9 | |||
10 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
12 | --- | ||
13 | src/configure.ac | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/configure.ac b/src/configure.ac | ||
17 | index 107c170..0ee86ad 100644 | ||
18 | --- a/src/configure.ac | ||
19 | +++ b/src/configure.ac | ||
20 | @@ -3220,7 +3220,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ | ||
21 | sys/systeminfo.h locale.h sys/stream.h termios.h \ | ||
22 | libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ | ||
23 | utime.h sys/param.h libintl.h libgen.h \ | ||
24 | - util/debug.h util/msg18n.h frame.h sys/acl.h \ | ||
25 | + util/debug.h util/msg18n.h frame.h \ | ||
26 | sys/access.h sys/sysinfo.h wchar.h wctype.h) | ||
27 | |||
28 | dnl sys/ptem.h depends on sys/stream.h on Solaris | ||
29 | @@ -3848,6 +3848,7 @@ AC_ARG_ENABLE(acl, | ||
30 | , [enable_acl="yes"]) | ||
31 | if test "$enable_acl" = "yes"; then | ||
32 | AC_MSG_RESULT(no) | ||
33 | + AC_CHECK_HEADERS(sys/acl.h) | ||
34 | AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], | ||
35 | AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" | ||
36 | AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) | ||
37 | -- | ||
38 | 2.7.4 | ||
39 | |||
diff --git a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch new file mode 100644 index 0000000000..37914d4cd9 --- /dev/null +++ b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 38de4bccdb8a861ffdd447f12fdab19d6d852c02 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chong Lu <Chong.Lu@windriver.com> | ||
3 | Date: Tue, 26 Jun 2018 17:34:15 +0800 | ||
4 | Subject: [PATCH] vim: add knob whether elf.h are checked | ||
5 | |||
6 | Previously, it still was checked when there was no elf library in sysroots directory. | ||
7 | Add knob to decide whether elf.h are checked or not. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
12 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
13 | --- | ||
14 | src/configure.ac | 7 +++++++ | ||
15 | 1 file changed, 7 insertions(+) | ||
16 | |||
17 | diff --git a/src/configure.ac b/src/configure.ac | ||
18 | index 0ee86ad..64736f0 100644 | ||
19 | --- a/src/configure.ac | ||
20 | +++ b/src/configure.ac | ||
21 | @@ -3192,11 +3192,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));], | ||
22 | AC_MSG_RESULT(no)) | ||
23 | |||
24 | dnl Checks for header files. | ||
25 | +AC_MSG_CHECKING(whether or not to look for elf.h) | ||
26 | +AC_ARG_ENABLE(elf-check, | ||
27 | + [ --enable-elf-check If elfutils, check for elf.h [default=no]], | ||
28 | + , enable_elf_check="no") | ||
29 | +AC_MSG_RESULT($enable_elf_check) | ||
30 | +if test "x$enable_elf_check" != "xno"; then | ||
31 | AC_CHECK_HEADER(elf.h, HAS_ELF=1) | ||
32 | dnl AC_CHECK_HEADER(dwarf.h, SVR4=1) | ||
33 | if test "$HAS_ELF" = 1; then | ||
34 | AC_CHECK_LIB(elf, main) | ||
35 | fi | ||
36 | +fi | ||
37 | |||
38 | AC_HEADER_DIRENT | ||
39 | |||
40 | -- | ||
41 | 2.7.4 | ||
42 | |||