[oe-commits] =?UTF-8?Q?Andr=C3=A9=20Draszik=20?=: icu-native: fix hard paths in native icu

[git at git.openembedded.org]

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

Author: André Draszik <adraszik at digisoft.tv>
Date:   Mon May 18 09:06:01 2015 +0100

icu-native: fix hard paths in native icu

The icu recipe installs icu-native twice, once in the usual location,
and once for cross builds into the path given by --with-cross-build.

This latter path is not included in the list of paths recognised by
chrpath.bbclass, hence the binaries in there retain the rpath as used
during compilation. This causes the package to not be relocateable
from sstate
[YOCTO #6851]

We use the infrastructure that is in place already, and simply set
PREPROCESS_RELOCATE_DIRS as necessary, and things start to work.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-support/icu/icu.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index f4254b5..cc6f222 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -26,6 +26,7 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
 EXTRA_OECONF_class-native = ""
 EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
 
+PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}"
 do_install_append_class-native() {
 	mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
 	cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config