summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-08-17 13:38:10 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 13:06:19 +0100
commitb40a03c43d5d9d738a9aa5b43b2ecfe74fc95018 (patch)
treedd41a98cfc8704f3e7321eeb2299ebff9f6d78f2
parentd81768560676da201fd730ae3930b080ab8c5c75 (diff)
downloadopenembedded-core-b40a03c43d5d9d738a9aa5b43b2ecfe74fc95018.tar.gz
openembedded-core-b40a03c43d5d9d738a9aa5b43b2ecfe74fc95018.tar.bz2
openembedded-core-b40a03c43d5d9d738a9aa5b43b2ecfe74fc95018.zip
package.bbclass: change RPATHs for cross-canadian binaries
When building the meta-toolchain, the binaries didn't get relocatable RPATHs. They were hardcoded to the default path. Hence, if one had already installed one SDK in the default path and one in another location, the later toolchain's binaries would search and load libraries from the first location, ending in a "Segmentation Fault". [YOCTO #2927] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index d122cd9f8f..278f0f0ea9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -448,7 +448,7 @@ python perform_packagecopy () {
subprocess.call('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar), shell=True)
# replace RPATHs for the nativesdk binaries, to make them relocatable
- if bb.data.inherits_class('nativesdk', d):
+ if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('cross-canadian', d):
rpath_replace (dvar, d)
}