sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Richard Purdie 2012-04-02 12:52:12 +01:00
parent 5dcac2b359
commit 723c91297d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
View File

@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5"
inherit native
PR = "r2"
PR = "r3"
S = "${WORKDIR}"

8
meta/recipes-core/gettext/gettext_0.18.1.1.bb
View File

@ -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"