summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2020-04-15 14:28:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-24 14:10:08 +0100
commit13cad0f5c41b8abf11d2cfc383e3b9b5ca2721f4 (patch)
tree9f8e0de4bdbe6706df96391957b4d33a4a03ca2b
parent5c90ec2d800947b20b8551521a669ab90c7fd9c8 (diff)
downloadpoky-13cad0f5c41b8abf11d2cfc383e3b9b5ca2721f4.tar.gz
vim: do not adjust script paths building for target
When cross-compiling, do not change scripts to use host versions of perl and gawk. Also, use INSANE_SKIP to suppress QA complaints if perl or gawk are not on the target. (From OE-Core rev: 8972fe5581b9fe8ef14d539001758bb13bca6737) Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/vim/files/no-path-adjust.patch27
-rw-r--r--meta/recipes-support/vim/vim.inc12
2 files changed, 33 insertions, 6 deletions
diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch
new file mode 100644
index 0000000000..05c2d803f6
--- /dev/null
+++ b/meta/recipes-support/vim/files/no-path-adjust.patch
@@ -0,0 +1,27 @@
1vim: do not adjust script pathnames
2
3When cross-compiling, we do not want to reference the host versions of
4things like perl and awk.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joe Slater <joe.slater@windriver.com>
9
10--- a/src/Makefile
11+++ b/src/Makefile
12@@ -2507,11 +2507,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
13 rm -rf $$cvs; \
14 fi
15 -chmod $(FILEMOD) $(DEST_TOOLS)/*
16-# replace the path in some tools
17+
18+# replace the path in some tools, but not when cross-compiling
19+ifneq ($(CROSS_COMPILING),1)
20 perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
21 awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
22 awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
23 awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
24+endif
25 -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
26
27 # install the language specific files for tools, if they were unpacked
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 78e3f9528d..9f3dc08027 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/vim/vim.git \
11 file://disable_acl_header_check.patch \ 11 file://disable_acl_header_check.patch \
12 file://vim-add-knob-whether-elf.h-are-checked.patch \ 12 file://vim-add-knob-whether-elf.h-are-checked.patch \
13 file://0001-src-Makefile-improve-reproducibility.patch \ 13 file://0001-src-Makefile-improve-reproducibility.patch \
14 file://no-path-adjust.patch \
14" 15"
15SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" 16SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44"
16 17
@@ -82,12 +83,6 @@ EXTRA_OECONF = " \
82do_install() { 83do_install() {
83 autotools_do_install 84 autotools_do_install
84 85
85 # Work around file-rdeps picking up csh, awk, perl or python as a dep
86 chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132
87 chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk
88 chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl
89 chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py
90
91 # Install example vimrc from runtime files 86 # Install example vimrc from runtime files
92 install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc 87 install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc
93 88
@@ -110,7 +105,12 @@ FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
110FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" 105FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
111FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc" 106FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
112FILES_${PN}-data = "${datadir}/${BPN}" 107FILES_${PN}-data = "${datadir}/${BPN}"
108
109# We do not want to complain if perl or gawk are not on the target.
110#
113FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" 111FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools"
112INSANE_SKIP_${PN}-tools = "file-rdeps"
113
114FILES_${PN}-common = " \ 114FILES_${PN}-common = " \
115 ${datadir}/${BPN}/${VIMDIR}/*.vim \ 115 ${datadir}/${BPN}/${VIMDIR}/*.vim \
116 ${datadir}/${BPN}/${VIMDIR}/autoload \ 116 ${datadir}/${BPN}/${VIMDIR}/autoload \