summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-06-26 12:38:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-28 09:14:06 +0100
commit321134f88df157c316a8531e1adbfc3a1b582ec2 (patch)
treeaa6fcb452bfa5f208b8a737da9da30a372333a93 /meta/recipes-devtools
parent8b45f23237aaf50f2d8d34c57f28cd21deba0f9e (diff)
downloadpoky-321134f88df157c316a8531e1adbfc3a1b582ec2.tar.gz
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 <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal7
1 files changed, 7 insertions, 0 deletions
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
220 $SUDO ln -sfn $(readlink $l|sed -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:") $l 220 $SUDO ln -sfn $(readlink $l|sed -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:") $l
221done 221done
222 222
223# find out all perl scripts in $OECORE_NATIVE_SYSROOT and modify them
224# replacing the host perl with SDK perl.
225for perl_script in $($SUDO grep -m 1 "^#!.*perl" -rl $OECORE_NATIVE_SYSROOT); do
226 $SUDO sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \
227 "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script
228done
229
223echo_info "\nSuccessfully installed selected native ADT!" 230echo_info "\nSuccessfully installed selected native ADT!"
224} 231}
225 232