diff options
author | Ross Burton <ross.burton@intel.com> | 2015-05-15 17:42:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 22:08:02 +0100 |
commit | 226ba5c4eb9f3d3251b1f8b143d7de7352c72f70 (patch) | |
tree | e23fb7bc5e3e997afb8e013fbb5a4c5da35917cd /meta | |
parent | c41b5b6fc3462cd3b1d8946ec1852b5dac7438e9 (diff) | |
download | openembedded-core-contrib-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')
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf.inc | 14 |
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 \ 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 -} +} |