diff options
-rw-r--r-- | meta/recipes-support/vim/files/no-path-adjust.patch | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch index 9d6da80913..908459a95e 100644 --- a/meta/recipes-support/vim/files/no-path-adjust.patch +++ b/meta/recipes-support/vim/files/no-path-adjust.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | vim: do not adjust script pathnames | 1 | From 4125a1ccb82fd53d003acdc34e462f238f0c4f0d Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Fri, 8 Jul 2022 11:03:22 +0800 | ||
4 | Subject: [PATCH] vim: do not adjust script pathnames | ||
2 | 5 | ||
3 | When cross-compiling, we do not want to reference the host versions of | 6 | When cross-compiling, we do not want to reference the host versions of |
4 | things like perl and awk. | 7 | things like perl and awk. |
@@ -6,24 +9,28 @@ things like perl and awk. | |||
6 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
7 | 10 | ||
8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 11 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
13 | --- | ||
14 | src/Makefile | 6 +----- | ||
15 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
9 | 16 | ||
10 | Index: git/src/Makefile | 17 | diff --git a/src/Makefile b/src/Makefile |
11 | =================================================================== | 18 | index c9513a632..7a7cbdc43 100644 |
12 | --- git.orig/src/Makefile | 19 | --- a/src/Makefile |
13 | +++ git/src/Makefile | 20 | +++ b/src/Makefile |
14 | @@ -2565,11 +2565,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ | 21 | @@ -2534,11 +2534,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ |
15 | rm -rf $$cvs; \ | 22 | rm -rf $$cvs; \ |
16 | fi | 23 | fi |
17 | -chmod $(FILEMOD) $(DEST_TOOLS)/* | 24 | -chmod $(FILEMOD) $(DEST_TOOLS)/* |
18 | -# replace the path in some tools | 25 | -# replace the path in some tools |
19 | + | 26 | - perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl |
20 | +# replace the path in some tools, but not when cross-compiling | 27 | - awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ |
21 | +ifneq ($(CROSS_COMPILING),1) | 28 | - awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ |
22 | perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl | 29 | - awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi |
23 | awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ | 30 | +# not replace the path in some tools |
24 | awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ | ||
25 | awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi | ||
26 | +endif | ||
27 | -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` | 31 | -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` |
28 | 32 | ||
29 | # install the language specific files for tools, if they were unpacked | 33 | # install the language specific files for tools, if they were unpacked |
34 | -- | ||
35 | 2.25.1 | ||
36 | |||