[oe-commits] Laurentiu Palcu : package.bbclass: change RPATHs for cross-canadian binaries

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: b40a03c43d5d9d738a9aa5b43b2ecfe74fc95018
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b40a03c43d5d9d738a9aa5b43b2ecfe74fc95018

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Fri Aug 17 13:38:10 2012 +0300

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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index d122cd9..278f0f0 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)
 }