diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-18 02:05:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-18 13:18:25 +0000 |
commit | 6b94c4c13aa093d594abb8caadea55e4f27f545a (patch) | |
tree | bee8555d4ddea1538c983ae216f7ba671fa150e6 | |
parent | 3bddba86153a2ed0a4043f256cd964d1177655ec (diff) | |
download | openembedded-core-contrib-6b94c4c13aa093d594abb8caadea55e4f27f545a.tar.gz |
icu: Fix case where ${B} != ${S}
Fix out of tree builds by fixing cwd assumptions and using correct
full paths where needed, or just simply the correct paths.
(From OE-Core rev: 0525a1556ab3d25d9e6bda2fc3c8e40123825109)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/icu/icu.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index 64b3edf3ca..d7cb84a400 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc @@ -27,15 +27,15 @@ EXTRA_OECONF_class-native = "" # This is a bug of ICU. See bug reference: # http://bugs.icu-project.org/trac/ticket/9790 do_configure_prepend() { - [ -f acinclude.m4 ] || cp aclocal.m4 acinclude.m4 + [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4 ${S}/acinclude.m4 } do_install_append_class-native() { mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${S}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${S}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${S}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${S}/tools ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} } |