Override awk and perl path to avoid using local absolute path. Signed-off-by: Oleksiy Obitotskyy <[email protected]> --- .../0001-vim-Override-perl-and-awk.patch | 34 +++++++++++++++++++ meta/recipes-support/vim/vim.inc | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-support/vim/files/0001-vim-Override-perl-and-awk.patch
diff --git a/meta/recipes-support/vim/files/0001-vim-Override-perl-and-awk.patch b/meta/recipes-support/vim/files/0001-vim-Override-perl-and-awk.patch new file mode 100644 index 0000000000..1d619e0800 --- /dev/null +++ b/meta/recipes-support/vim/files/0001-vim-Override-perl-and-awk.patch @@ -0,0 +1,34 @@ +From 1c1ca2d6306fa4b1391f54325cdd63d56d3b7b78 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <[email protected]> +Date: Mon, 22 Feb 2021 15:21:00 +0200 +Subject: [PATCH] vim: Improve reproducibility + +Override awk and perl path to avoid +using local absolute path. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <[email protected]> +--- + src/Makefile | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index b7e2f7eef..c2e7efbde 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2510,10 +2510,8 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ + + # 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 ++ perlpath=$(PERL) && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl ++ awkpath=$(AWK) && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk + endif + -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` + +-- +2.25.1 + diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index d57f784da5..efe63e7a8e 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/vim/vim.git \ file://0001-src-Makefile-improve-reproducibility.patch \ file://no-path-adjust.patch \ file://racefix.patch \ + file://0001-vim-Override-perl-and-awk.patch \ " SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" @@ -80,6 +81,8 @@ EXTRA_OECONF = " \ vim_cv_tgetent=non-zero \ vim_cv_toupper_broken=no \ vim_cv_tty_group=world \ + AWK=${bindir}/awk \ + vi_cv_path_perl=${bindir}/perl \ STRIP=/bin/true \ " -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148482): https://lists.openembedded.org/g/openembedded-core/message/148482 Mute This Topic: https://lists.openembedded.org/mt/80828943/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
