aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-03-11 15:04:17 +0800
committerRoss Burton <ross.burton@intel.com>2013-04-23 10:38:46 +0100
commit9c10356bde6d303d84daadb8c1170e08e774f5af (patch)
treeb7ca7b3cf224fccb005833788bd1c64ea4eda751
parent6571278b896474c58bf5552d0e46237f2cf5096c (diff)
downloadopenembedded-core-9c10356bde6d303d84daadb8c1170e08e774f5af.zip
openembedded-core-9c10356bde6d303d84daadb8c1170e08e774f5af.tar.gz
openembedded-core-9c10356bde6d303d84daadb8c1170e08e774f5af.tar.bz2
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. Cherry-pick commit aeb53bd78991af9fbb60d64176ec864cfc2ddbb9 [YOCTO #3984] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--meta/classes/populate_sdk_base.bbclass7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 5e4ed51..55285d9 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -183,6 +183,13 @@ fi
# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc
find $native_sysroot -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|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 $(grep "^#!.*perl" -rls $native_sysroot); do
+ 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 $(find $native_sysroot -type l); do
ln -sfn $(readlink $l|sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l