* [PATCH] vim: Improve reproducibility
@ 2021-02-22 16:42 Oleksiy Obitotskyy
2021-02-23 8:32 ` [OE-core] " Richard Purdie
[not found] ` <1666535551897E27.6890@lists.openembedded.org>
0 siblings, 2 replies; 3+ messages in thread
From: Oleksiy Obitotskyy @ 2021-02-22 16:42 UTC (permalink / raw)
To: openembedded-core; +Cc: Oleksiy Obitotskyy
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] vim: Improve reproducibility
2021-02-22 16:42 [PATCH] vim: Improve reproducibility Oleksiy Obitotskyy
@ 2021-02-23 8:32 ` Richard Purdie
[not found] ` <1666535551897E27.6890@lists.openembedded.org>
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2021-02-23 8:32 UTC (permalink / raw)
To: oobitots, openembedded-core
On Mon, 2021-02-22 at 08:42 -0800, Oleksiy Obitotskyy via lists.openembedded.org wrote:
> 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
Fails in vim-native unfortunately:
https://autobuilder.yoctoproject.org/typhoon/#/builders/115/builds/26/steps/13/logs/stdio
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] vim: Improve reproducibility
[not found] ` <1666535551897E27.6890@lists.openembedded.org>
@ 2021-02-26 15:52 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2021-02-26 15:52 UTC (permalink / raw)
To: oobitots, openembedded-core
On Tue, 2021-02-23 at 08:32 +0000, Richard Purdie via lists.openembedded.org wrote:
> On Mon, 2021-02-22 at 08:42 -0800, Oleksiy Obitotskyy via lists.openembedded.org wrote:
> > 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
>
> Fails in vim-native unfortunately:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/115/builds/26/steps/13/logs/stdio
>
I'm also a little puzzled as vim reproduces ok in master as far as I
know. Which configuration produces the issue? Is this a /usr/bin vs /bin
issue?
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-26 15:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22 16:42 [PATCH] vim: Improve reproducibility Oleksiy Obitotskyy
2021-02-23 8:32 ` [OE-core] " Richard Purdie
[not found] ` <1666535551897E27.6890@lists.openembedded.org>
2021-02-26 15:52 ` Richard Purdie
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.