[OE-core] [PATCH 14/46] glib-2.0: Inherit gettext should provide right libintl so remove from DEPENDS

[Richard Purdie]

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
> index 6a1fb6c..256abc1 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
> @@ -1,13 +1,15 @@
>  require glib.inc
>  
>  PE = "1"
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI = "${GNOME_MIRROR}/glib/2.26/glib-${PV}.tar.bz2 \
>             file://configure-libtool.patch \
>             file://60_wait-longer-for-threads-to-die.patch \
>             file://g_once_init_enter.patch \
>            "
> +# Only apply this patch for target recipe on uclibc
> +SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
>  
>  SRC_URI[md5sum] = "17535accceef55bcb17a74d73f9c2aef"
>  SRC_URI[sha256sum] = "7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5"
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
> index 4014a1b..8320ee9 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
> @@ -1,11 +1,12 @@
>  require glib.inc
>  
> -PR = "r3"
> +PR = "r4"
>  
>  SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \
>             file://configure-libtool.patch \
>             file://60_wait-longer-for-threads-to-die.patch \
>             file://g_once_init_enter.patch \
> +           file://no-iconv.patch \
>            "
>  
>  SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f"

Why is this being done conditionally in one version and not the other?

Cheers,

Richard