From 467eb93f5f252ab1a608397b9e97e1d6043501ef Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 15 May 2015 17:42:08 +0100 Subject: autoconf: simplify perl location forcing logic Instead of letting configure find the host's perl and then use a complicated sed to replace it at install time, simply pre-seed the configure logic with the path we want to use. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf/autoconf.inc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'meta/recipes-devtools/autoconf') diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 8b00fbddf5..78b77e8c98 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc @@ -32,20 +32,12 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ inherit autotools texinfo +CACHED_CONFIGUREVARS += "ac_cv_path_PERL=${USRBINPATH}/perl" + do_configure() { oe_runconf } do_install_append() { rm -rf ${D}${datadir}/emacs - - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - for i in autoheader autom4te autoreconf autoscan autoupdate ifnames; do - if [ -f ${D}${bindir}/$i ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ - -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ - ${D}${bindir}/$i - fi - done -} +} -- cgit 1.2.3-korg