summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-02 12:52:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-02 12:54:45 +0100
commit723c91297d833f989b762c661d05eef6a5e2fe5c (patch)
tree5bb00ba82d85188279b40d10a78bc0075da17f52
parent5dcac2b3597dd110e656f56bf37a1b7359e8d240 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb2
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb8
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
index ab4acafa77..d10e3f940a 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5"
9 9
10inherit native 10inherit native
11 11
12PR = "r2" 12PR = "r3"
13 13
14S = "${WORKDIR}" 14S = "${WORKDIR}"
15 15
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 4144d2b51f..46647512fa 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"
5LICENSE = "GPLv3+ & LGPL-2.1+" 5LICENSE = "GPLv3+ & LGPL-2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r10" 8PR = "r11"
9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
10DEPENDS_virtclass-native = "libxml2-native" 10DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
12PROVIDES_virtclass-native = "virtual/gettext-native" 12PROVIDES_virtclass-native = "virtual/gettext-native"
13CONFLICTS_${PN} = "proxy-libintl" 13CONFLICTS_${PN} = "proxy-libintl"
@@ -95,4 +95,8 @@ do_install_append() {
95 rm -f ${D}${libdir}/preloadable_libintl.so 95 rm -f ${D}${libdir}/preloadable_libintl.so
96} 96}
97 97
98do_install_append_virtclass-native () {
99 rm ${D}${datadir}/aclocal/*
100}
101
98BBCLASSEXTEND = "native nativesdk" 102BBCLASSEXTEND = "native nativesdk"