[oe-commits] Paul Eggleton : libiconv: skip recipe if using eglibc

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f3e2ccff952f148522a09c09e0dea92e59bab5b6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f3e2ccff952f148522a09c09e0dea92e59bab5b6

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Aug 20 14:20:41 2012 +0100

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.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-support/libiconv/libiconv_1.11.1.bb |    5 +++++
 meta/recipes-support/libiconv/libiconv_1.14.bb   |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

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