Patchwork [4/4] base/glib-2.0: Simplify USE_NLS handling for glib-2.0

login
register
mail settings
Submitter Richard Purdie
Date June 23, 2011, 12:27 p.m.
Message ID <e294582e4b02e5f1ca7f2a83ec79498676a20bc2.1308831847.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/6405/
State New, archived
Headers show

Comments

Richard Purdie - June 23, 2011, 12:27 p.m.
Currently the only way to get anything to build is to set USE_NLS="yes"
for glib-2.0. We might as well do this in the recipe by default for
now and simpllify the code.

The magic handling of USE_NLS_<recipename> is also removed since this
can be done in the form USE_NLS_pn-<recipename> using overrides these
days.

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/base.bbclass                  |    4 ----
 meta/conf/distro/include/tclibc-uclibc.inc |    1 -
 meta/recipes-core/glib-2.0/glib-2.0.inc    |    6 ------
 meta/recipes-core/glib-2.0/glib.inc        |    3 +--
 4 files changed, 1 insertions(+), 13 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0.inc
Khem Raj - June 23, 2011, 11:46 p.m.
On 06/23/2011 05:27 AM, Richard Purdie wrote:
> Currently the only way to get anything to build is to set USE_NLS="yes"
> for glib-2.0. We might as well do this in the recipe by default for
> now and simpllify the code.
>
> The magic handling of USE_NLS_<recipename>  is also removed since this
> can be done in the form USE_NLS_pn-<recipename>  using overrides these
> days.
>

looks good to me

> Signed-off-by: Richard  Purdie<richard.purdie@linuxfoundation.org>
> ---
>   meta/classes/base.bbclass                  |    4 ----
>   meta/conf/distro/include/tclibc-uclibc.inc |    1 -
>   meta/recipes-core/glib-2.0/glib-2.0.inc    |    6 ------
>   meta/recipes-core/glib-2.0/glib.inc        |    3 +--
>   4 files changed, 1 insertions(+), 13 deletions(-)
>   delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0.inc
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 0bea639..575352d 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -303,10 +303,6 @@ python () {
>                       bb.note("SKIPPING %s because it's %s" % (pn, this_license))
>                       raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
>
> -    use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
> -    if use_nls != None:
> -        bb.data.setVar('USE_NLS', use_nls, d)
> -
>       # Git packages should DEPEND on git-native
>       srcuri = bb.data.getVar('SRC_URI', d, 1)
>       if "git://" in srcuri:
> diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
> index 83418d6..65693a9 100644
> --- a/meta/conf/distro/include/tclibc-uclibc.inc
> +++ b/meta/conf/distro/include/tclibc-uclibc.inc
> @@ -14,7 +14,6 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
>   PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
>
>   USE_NLS ?= "no"
> -USE_NLS_glib-2.0 = "yes"
>
>   CXXFLAGS += "-fvisibility-inlines-hidden"
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
> deleted file mode 100644
> index ccbbd2b..0000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0.inc
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -
> -python () {
> -    import bb
> -    if bb.data.getVar("USE_NLS", d, 1) == "no":
> -        raise bb.parse.SkipPackage("${PN} requires native language support.")
> -}
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> index 0800c85..e25db3d 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
>   BUGTRACKER = "http://bugzilla.gnome.org"
>   SECTION = "libs"
>
> -require glib-2.0.inc
> -
>   DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
>   DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
>   DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
> @@ -36,3 +34,4 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include"
>   FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
>
>   ARM_INSTRUCTION_SET = "arm"
> +USE_NLS = "yes"

Patch

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0bea639..575352d 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -303,10 +303,6 @@  python () {
                     bb.note("SKIPPING %s because it's %s" % (pn, this_license))
                     raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
 
-    use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
-    if use_nls != None:
-        bb.data.setVar('USE_NLS', use_nls, d)
-
     # Git packages should DEPEND on git-native
     srcuri = bb.data.getVar('SRC_URI', d, 1)
     if "git://" in srcuri:
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 83418d6..65693a9 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -14,7 +14,6 @@  PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
 PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
 
 USE_NLS ?= "no"
-USE_NLS_glib-2.0 = "yes"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
diff --git a/meta/recipes-core/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
deleted file mode 100644
index ccbbd2b..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0.inc
+++ /dev/null
@@ -1,6 +0,0 @@ 
-
-python () {
-    import bb
-    if bb.data.getVar("USE_NLS", d, 1) == "no":
-        raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0800c85..e25db3d 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -13,8 +13,6 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
 BUGTRACKER = "http://bugzilla.gnome.org"
 SECTION = "libs"
 
-require glib-2.0.inc
-
 DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
 DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
 DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
@@ -36,3 +34,4 @@  FILES_${PN}-dev += "${libdir}/glib-2.0/include"
 FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
 
 ARM_INSTRUCTION_SET = "arm"
+USE_NLS = "yes"