Patchwork [meta-oe,v4,07/12] libiconv: drop hack since gettext was being inherited

login
register
mail settings
Submitter Otavio Salvador
Date May 9, 2011, 7:16 p.m.
Message ID <1304968617-4949-7-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/3509/
State New, archived
Headers show

Comments

Otavio Salvador - May 9, 2011, 7:16 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-support/libiconv/libiconv_1.13.1.bb    |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Khem Raj - May 11, 2011, 4:29 a.m.
On Mon, May 9, 2011 at 12:16 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  .../recipes-support/libiconv/libiconv_1.13.1.bb    |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb b/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb
> index 4db70cb..868314b 100644
> --- a/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb
> +++ b/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb
> @@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
>  BBCLASSEXTEND = "native nativesdk"
>
>  PROVIDES = "virtual/libiconv"
> -PR = "r1"
> -
> -#gettext.class cant be inherit here so use this hack
> -DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
> +PR = "r2"
>
>  EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
>

even this setting of EXTRA_OECONF can be dropped since --enable-nls
and --disable-nls are also taken care by gettext bbclass
> --
> 1.7.2.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Otavio Salvador - May 12, 2011, 1:51 p.m.
On Wed, May 11, 2011 at 01:29, Khem Raj <raj.khem@gmail.com> wrote:
...
>>  EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
>>
>
> even this setting of EXTRA_OECONF can be dropped since --enable-nls
> and --disable-nls are also taken care by gettext bbclass

It has already been merged but I queued up a patch for this, on my new
pull request ... but will wait to have more changes to send it.

Patch

diff --git a/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb b/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb
index 4db70cb..868314b 100644
--- a/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb
+++ b/meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb
@@ -8,10 +8,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 BBCLASSEXTEND = "native nativesdk"
 
 PROVIDES = "virtual/libiconv"
-PR = "r1"
-
-#gettext.class cant be inherit here so use this hack
-DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+PR = "r2"
 
 EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"