diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-17 11:44:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-17 11:49:47 +0000 |
| commit | a508e7c03840efcd5877f4185e8f024cedb9453f (patch) | |
| tree | f8a0132e93779ee333a573a55ca78be19d02ee21 | |
| parent | 02bc593928735abb9ac5c85b9e94d0285a6f3e8c (diff) | |
| download | openembedded-core-a508e7c03840efcd5877f4185e8f024cedb9453f.tar.gz openembedded-core-a508e7c03840efcd5877f4185e8f024cedb9453f.tar.bz2 openembedded-core-a508e7c03840efcd5877f4185e8f024cedb9453f.zip | |
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
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config_20080123.bb | 4 |
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 @@ -#! /usr/bin/perl -w +#! /usr/bin/env perl # -*- perl -*- eval '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" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.1+cvs${FIXEDSRCDATE}" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ file://config-guess-uclibc.patch \ @@ -27,7 +27,7 @@ do_install () { -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then - sed -i -e 's,/usr/bin/perl,${bindir}/perl,g' ${D}${bindir}/gnu-configize + sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi chmod 755 ${D}${bindir}/gnu-configize install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/ |