All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Oleksiy Obitotskyy" <oobitots@cisco.com>
To: openembedded-core@lists.openembedded.org
Cc: Oleksiy Obitotskyy <oobitots@cisco.com>
Subject: [PATCH] vim: Improve reproducibility
Date: Mon, 22 Feb 2021 08:42:11 -0800	[thread overview]
Message-ID: <20210222164211.23449-1-oobitots@cisco.com> (raw)

Override awk and perl path to avoid
using local absolute path.

Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
---
 .../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 <oobitots@cisco.com>
+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 <oobitots@cisco.com>
+---
+ 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


             reply	other threads:[~2021-02-22 16:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-22 16:42 Oleksiy Obitotskyy [this message]
2021-02-23  8:32 ` [OE-core] [PATCH] vim: Improve reproducibility Richard Purdie
     [not found] ` <1666535551897E27.6890@lists.openembedded.org>
2021-02-26 15:52   ` Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210222164211.23449-1-oobitots@cisco.com \
    --to=oobitots@cisco.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.