summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-17 11:44:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-17 12:33:46 +0000
commit06c755cb1a96df69fd2d8937f49592a3581af2aa (patch)
tree44b98e01cec1cbecb0e3990826bc066f3c5e2215
parent7e2d385e85654a6041dbfc2c2f137d75a6ceae62 (diff)
downloadpoky-06c755cb1a96df69fd2d8937f49592a3581af2aa.tar.gz
gnu-config: Use perl from the environment, not a hardcoded path
Using the hardcoded perl binary can cause conflict between the files in the native sysroot and those of the build system perl. By using perl from the environment we can at least ensure a consistent perl environment. Patches taken from OE.dev commits: be21179c5321bd0afb9221f020ac12ad75c86a3b gnu-config: use /usr/bin/env perl instead of /usr/bin/perl in gnu-configize.in edcdefbf6e0675c1bcc1fc4f464f654223380e50 gnu-config: update also bindir change to replace /usr/bin/env instead of /usr/bin/perl (From OE-Core rev: a508e7c03840efcd5877f4185e8f024cedb9453f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in2
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config_20080123.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in b/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
index be8580c8e6..d4908fc4f9 100755
--- a/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
+++ b/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
@@ -1,4 +1,4 @@
1#! /usr/bin/perl -w 1#! /usr/bin/env perl
2# -*- perl -*- 2# -*- perl -*-
3 3
4eval 'case $# in 0) exec /usr/bin/perl -S "$0";; *) exec /usr/bin/perl -S "$0" "$@";; esac' 4eval 'case $# in 0) exec /usr/bin/perl -S "$0";; *) exec /usr/bin/perl -S "$0" "$@";; esac'
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb b/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
index 2629ecb52f..e0a815560f 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
@@ -8,7 +8,7 @@ INHIBIT_DEFAULT_DEPS = "1"
8 8
9FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" 9FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
10PV = "0.1+cvs${FIXEDSRCDATE}" 10PV = "0.1+cvs${FIXEDSRCDATE}"
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ 13SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
14 file://config-guess-uclibc.patch \ 14 file://config-guess-uclibc.patch \
@@ -27,7 +27,7 @@ do_install () {
27 -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize 27 -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize
28 # In the native case we want the system perl as perl-native can't have built yet 28 # In the native case we want the system perl as perl-native can't have built yet
29 if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then 29 if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then
30 sed -i -e 's,/usr/bin/perl,${bindir}/perl,g' ${D}${bindir}/gnu-configize 30 sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
31 fi 31 fi
32 chmod 755 ${D}${bindir}/gnu-configize 32 chmod 755 ${D}${bindir}/gnu-configize
33 install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/ 33 install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/