From 321134f88df157c316a8531e1adbfc3a1b582ec2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 26 Jun 2013 12:38:47 +0800 Subject: adt_installer_internal:fix perl lib version mismatch When run "autoreconf" in toolchain, there is an error if the host's perl's version is not the same as the one in the SDK, the error says that the executable perl mismatches the perl lib's version. This is because most of the autotools' scripts use the "#!/usr/bin/perl -w" which is host perl, but the gnu-configize uses "#! /usr/bin/env perl" which invokes the perl wrapper in the SDK, and the wrapper will set the PERL5LIB to the SDK which causes the mismatch. We can make all the perl scripts to use the host perl or the SDK perl to fix this problem. [YOCTO #4758] (From OE-Core rev: 487d1fa7b79e89518494986461c157bace842613) Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../installer/adt-installer/scripts/adt_installer_internal | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'meta/recipes-devtools/installer') diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index 25c955a5cb..16677e71f1 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -220,6 +220,13 @@ for l in $(find $NATIVE_INSTALL_DIR -type l); do $SUDO ln -sfn $(readlink $l|sed -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:") $l done +# find out all perl scripts in $OECORE_NATIVE_SYSROOT and modify them +# replacing the host perl with SDK perl. +for perl_script in $($SUDO grep -m 1 "^#!.*perl" -rl $OECORE_NATIVE_SYSROOT); do + $SUDO sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \ + "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script +done + echo_info "\nSuccessfully installed selected native ADT!" } -- cgit v1.2.3-54-g00ecf