From 8a2664b1c2f7ad6d34714d87ff78c02b4af99562 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 20 Aug 2012 14:20:41 +0100 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-support/libiconv/libiconv_1.11.1.bb | 5 +++++ meta/recipes-support/libiconv/libiconv_1.14.bb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb index 186a5a17b8..055e20d4f1 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 af33d6bc95..6666866a90 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" -- cgit v1.2.3-54-g00ecf