mirror of
https://git.yoctoproject.org/poky
synced 2026-03-02 05:19:40 +01:00
94483d6607
There's a fairly constant flow of CVEs being fixed in Vim, which are getting increasing non-trivial to backport. Instead of trying to backport (and potentially introduce more bugs), or just ignoring them entirely, upgrade vim to the latest patch in the hope that vim 8.3 will be released before we release Kirkstone. (From OE-Core rev: c987c75ca06c67b6055c50a9fb29e4fd24aceffc) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 78a4796de27d710f97c336d288d797557a58694e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
vim: do not adjust script pathnames
|
|
|
|
When cross-compiling, we do not want to reference the host versions of
|
|
things like perl and awk.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
|
|
|
Index: git/src/Makefile
|
|
===================================================================
|
|
--- git.orig/src/Makefile
|
|
+++ git/src/Makefile
|
|
@@ -2565,11 +2565,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
|
|
rm -rf $$cvs; \
|
|
fi
|
|
-chmod $(FILEMOD) $(DEST_TOOLS)/*
|
|
-# replace the path in some tools
|
|
+
|
|
+# replace the path in some tools, but not when cross-compiling
|
|
+ifneq ($(CROSS_COMPILING),1)
|
|
perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
|
|
awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
|
awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
|
awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
|
|
+endif
|
|
-chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
|
|
|
|
# install the language specific files for tools, if they were unpacked
|