From cf63d9068c3a8c635dfc240d30dfff278be9b0e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 Jul 2012 17:38:05 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/recipes-devtools/automake/automake_1.12.1.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools/automake') diff --git a/meta/recipes-devtools/automake/automake_1.12.1.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb index c2bc6a3068..a1e37d471c 100644 --- a/meta/recipes-devtools/automake/automake_1.12.1.bb +++ b/meta/recipes-devtools/automake/automake_1.12.1.bb @@ -34,10 +34,6 @@ PATHFIXPATCH = "file://path_prog_fixes.patch" PATHFIXPATCH_virtclass-native = "" PATHFIXPATCH_virtclass-nativesdk = "" -PERLPATH = "${bindir}/perl" -PERLPATH_virtclass-native = "/usr/bin/perl" -PERLPATH_virtclass-nativesdk = "/usr/bin/perl" - SRC_URI += "${PATHFIXPATCH} \ file://prefer-cpio-over-pax-for-ustar-archives.patch \ file://python-libdir.patch \ @@ -56,8 +52,8 @@ do_install () { # for target as /usr/bin/perl, so fix it to /usr/bin/perl. for i in aclocal aclocal-1.11 automake automake-1.11; do if [ -f ${D}${bindir}/$i ]; then - sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \ - -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \ + 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