From: Hongxu Jia Date: Fri, 1 Mar 2013 09:58:31 +0000 (+0800) Subject: populate_sdk_base.bbclass:fix toolchain relocation issues X-Git-Tag: rev_ivi_2015_02_04~13540 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd9f021f437d9c999d17592dc11cb98d62bd2ef2;p=scm%2Fbb%2Ftizen-distro.git populate_sdk_base.bbclass:fix toolchain relocation issues 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 #3338] (From OE-Core rev: 365aa1412a3d31128cb3df02959acdc7df5f2ebc) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index b99dc75..88de1e4 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -274,6 +274,13 @@ fi # replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc $SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep ":.*\(ASCII\|script\|source\).*text"|cut -d':' -f1|$SUDO_EXEC xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" +# find out all perl scripts in $native_sysroot and modify them replacing the +# host perl with SDK perl. +for perl_script in $($SUDO_EXEC grep "^#!.*perl" -rl $native_sysroot); do + $SUDO_EXEC 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 + # change all symlinks pointing to ${SDKPATH} for l in $($SUDO_EXEC find $native_sysroot -type l); do $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l