libiconv: skip recipe if using eglibc

libiconv is provided for use with uClibc - if you build it together with
eglibc (which already PROVIDES virtual/libiconv) you can end up with
dependency problems during do_rootfs.

(From OE-Core rev: f3e2ccff952f148522a09c09e0dea92e59bab5b6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
index 186a5a1..055e20d 100644 (file)
--- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
@@ -20,6 +20,11 @@ S = "${WORKDIR}/libiconv-${PV}"
 
 inherit autotools pkgconfig gettext
 
+python __anonymous() {
+    if d.getVar("TCLIBC", True) == "eglibc":
+        raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv")
+}
+
 EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
 
 LEAD_SONAME = "libiconv.so"

diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb
index af33d6b..6666866 100644 (file)
--- a/meta/recipes-support/libiconv/libiconv_1.14.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.14.bb
@@ -21,6 +21,11 @@ S = "${WORKDIR}/libiconv-${PV}"
 
 inherit autotools pkgconfig gettext
 
+python __anonymous() {
+    if d.getVar("TCLIBC", True) == "eglibc":
+        raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv")
+}
+
 EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
 
 LEAD_SONAME = "libiconv.so"