summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/autoconf/autoconf.inc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-05-15 17:42:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-15 22:08:02 +0100
commit226ba5c4eb9f3d3251b1f8b143d7de7352c72f70 (patch)
treee23fb7bc5e3e997afb8e013fbb5a4c5da35917cd /meta/recipes-devtools/autoconf/autoconf.inc
parentc41b5b6fc3462cd3b1d8946ec1852b5dac7438e9 (diff)
downloadpoky-226ba5c4eb9f3d3251b1f8b143d7de7352c72f70.tar.gz
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. (From OE-Core rev: 467eb93f5f252ab1a608397b9e97e1d6043501ef) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/autoconf/autoconf.inc')
-rw-r--r--meta/recipes-devtools/autoconf/autoconf.inc14
1 files changed, 3 insertions, 11 deletions
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 \
32 32
33inherit autotools texinfo 33inherit autotools texinfo
34 34
35CACHED_CONFIGUREVARS += "ac_cv_path_PERL=${USRBINPATH}/perl"
36
35do_configure() { 37do_configure() {
36 oe_runconf 38 oe_runconf
37} 39}
38 40
39do_install_append() { 41do_install_append() {
40 rm -rf ${D}${datadir}/emacs 42 rm -rf ${D}${datadir}/emacs
41 43}
42 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
43 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
44 for i in autoheader autom4te autoreconf autoscan autoupdate ifnames; do
45 if [ -f ${D}${bindir}/$i ]; then
46 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
47 -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \
48 ${D}${bindir}/$i
49 fi
50 done
51}