From: André Draszik Date: Mon, 18 May 2015 08:06:01 +0000 (+0100) Subject: icu-native: fix hard paths in native icu X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=922faf8ed42cd2d105e30a8c92836664d6b5bb18;p=openembedded-core.git 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. (From OE-Core rev: e7fcaa534511e3f65b630b01cf0c824ee5a5fd4d) Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index f4254b5f5c..cc6f222a50 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