summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/autoconf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-18 17:38:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-18 22:18:52 +0100
commitac7a0311825e20c544d17bfd8be63546ad36e665 (patch)
treefaf4f050bb8e629a5892f6eb7b0260583ca29451 /meta/recipes-devtools/autoconf
parent63f545b850ea4118a7e9e412aa8a22206dc7da8c (diff)
downloadpoky-ac7a0311825e20c544d17bfd8be63546ad36e665.tar.gz
bitbake.conf: Define USRBINPATH globally instead of individually
Many recipes are now having to define PERLPATH and PYTHONPATH variables. Creating USRBINPATH in bitbake.conf means we can remove all these lines from the many recipes now needing this and simplify the code changes needed in each case, reducing the chance of errors being introduced. Also fixup glib python binary location issue and fix function indentation. (From OE-Core rev: cf63d9068c3a8c635dfc240d30dfff278be9b0e2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/autoconf')
-rw-r--r--meta/recipes-devtools/autoconf/autoconf.inc8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index 3ae98c8407..2c077011f8 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
@@ -17,10 +17,6 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
17 17
18inherit autotools 18inherit autotools
19 19
20PERLPATH = "${bindir}/perl"
21PERLPATH_virtclass-native = "/usr/bin/perl"
22PERLPATH_virtclass-nativesdk = "/usr/bin/perl"
23
24do_install_append() { 20do_install_append() {
25 rm -rf ${D}${datadir}/emacs 21 rm -rf ${D}${datadir}/emacs
26 22
@@ -28,8 +24,8 @@ do_install_append() {
28 # for target as /usr/bin/perl, so fix it to /usr/bin/perl. 24 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
29 for i in autoheader autom4te autoreconf autoscan autoupdate ifnames; do 25 for i in autoheader autom4te autoreconf autoscan autoupdate ifnames; do
30 if [ -f ${D}${bindir}/$i ]; then 26 if [ -f ${D}${bindir}/$i ]; then
31 sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \ 27 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
32 -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \ 28 -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \
33 ${D}${bindir}/$i 29 ${D}${bindir}/$i
34 fi 30 fi
35 done 31 done