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 --- meta/recipes-support/vim/vim.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-support/vim/vim.inc') diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 78e3f9528d..9f3dc08027 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -11,6 +11,7 @@ SRC_URI = "git://github.com/vim/vim.git \ file://disable_acl_header_check.patch \ file://vim-add-knob-whether-elf.h-are-checked.patch \ file://0001-src-Makefile-improve-reproducibility.patch \ + file://no-path-adjust.patch \ " SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" @@ -82,12 +83,6 @@ EXTRA_OECONF = " \ do_install() { autotools_do_install - # Work around file-rdeps picking up csh, awk, perl or python as a dep - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132 - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl - chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py - # Install example vimrc from runtime files install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc @@ -110,7 +105,12 @@ FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc" FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc" FILES_${PN}-data = "${datadir}/${BPN}" + +# We do not want to complain if perl or gawk are not on the target. +# FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" +INSANE_SKIP_${PN}-tools = "file-rdeps" + FILES_${PN}-common = " \ ${datadir}/${BPN}/${VIMDIR}/*.vim \ ${datadir}/${BPN}/${VIMDIR}/autoload \ -- cgit v1.2.3-54-g00ecf