From 13cad0f5c41b8abf11d2cfc383e3b9b5ca2721f4 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Wed, 15 Apr 2020 14:28:38 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../recipes-support/vim/files/no-path-adjust.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 meta/recipes-support/vim/files/no-path-adjust.patch (limited to 'meta/recipes-support/vim/files/no-path-adjust.patch') 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 @@ +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 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -2507,11 +2507,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 -- cgit v1.2.3-54-g00ecf