diff options
-rw-r--r-- | meta/recipes-support/libiconv/libiconv_1.11.1.bb | 5 | ||||
-rw-r--r-- | 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 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}" | |||
20 | 20 | ||
21 | inherit autotools pkgconfig gettext | 21 | inherit autotools pkgconfig gettext |
22 | 22 | ||
23 | python __anonymous() { | ||
24 | if d.getVar("TCLIBC", True) == "eglibc": | ||
25 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv") | ||
26 | } | ||
27 | |||
23 | EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" | 28 | EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" |
24 | 29 | ||
25 | LEAD_SONAME = "libiconv.so" | 30 | 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}" | |||
21 | 21 | ||
22 | inherit autotools pkgconfig gettext | 22 | inherit autotools pkgconfig gettext |
23 | 23 | ||
24 | python __anonymous() { | ||
25 | if d.getVar("TCLIBC", True) == "eglibc": | ||
26 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv") | ||
27 | } | ||
28 | |||
24 | EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" | 29 | EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" |
25 | 30 | ||
26 | LEAD_SONAME = "libiconv.so" | 31 | LEAD_SONAME = "libiconv.so" |