[oe-commits] Ross Burton : autoconf: simplify perl location forcing logic

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 467eb93f5f252ab1a608397b9e97e1d6043501ef
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=467eb93f5f252ab1a608397b9e97e1d6043501ef

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri May 15 17:42:08 2015 +0100

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 <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/autoconf/autoconf.inc | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index 8b00fbd..78b77e8 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
-} 
+}