diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-02 12:52:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-02 12:54:45 +0100 |
commit | 723c91297d833f989b762c661d05eef6a5e2fe5c (patch) | |
tree | 5bb00ba82d85188279b40d10a78bc0075da17f52 /meta/recipes-core/gettext/gettext_0.18.1.1.bb | |
parent | 5dcac2b3597dd110e656f56bf37a1b7359e8d240 (diff) | |
download | ast2050-yocto-poky-723c91297d833f989b762c661d05eef6a5e2fe5c.zip ast2050-yocto-poky-723c91297d833f989b762c661d05eef6a5e2fe5c.tar.gz |
gettext: Fix sysroot conflict over owner of macros
gettext-minimal-native andgettext-native are trampling over each other's files. This can
be reproduced with:
bitbake gettext-minimal-native
bitbake gettext-native
bitbake gettext-native -c clean
bitbake shadow-native
which will fail since the aclocal gettext macros will have disappeared. This patch
fixes the problem by giving ownership of them to gettext-minimal-native and ensuring
there is a correct dependency on this.
(From OE-Core rev: 5bcb68a232539cf11a30e3b812b2fbd6d7d76e35)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext/gettext_0.18.1.1.bb')
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.18.1.1.bb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 4144d2b..4664751 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -5,9 +5,9 @@ SECTION = "libs" LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r10" +PR = "r11" DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" -DEPENDS_virtclass-native = "libxml2-native" +DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" PROVIDES_virtclass-native = "virtual/gettext-native" CONFLICTS_${PN} = "proxy-libintl" @@ -95,4 +95,8 @@ do_install_append() { rm -f ${D}${libdir}/preloadable_libintl.so } +do_install_append_virtclass-native () { + rm ${D}${datadir}/aclocal/* +} + BBCLASSEXTEND = "native nativesdk" |