[oe-commits] : uclibc: fix logic error for glib-2.0-native

[OE GIT Trial]

Module: OE.dev
Branch: master
Commit: 91d9fa947cd48626ab57ca97eb5173414b0dce17
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=91d9fa947cd48626ab57ca97eb5173414b0dce17

Author:  <woglinde2 at openembedded.org>
Date:   Thu Sep 18 00:45:18 2008 +0000

uclibc: fix logic error for glib-2.0-native
* if we set for glib-2.0 USE_NLS = yes, we have
  to do it for the native package too, otherwise
  the check function for USE_NLS bails out and build the
  older 2.12.4 package

---

 conf/distro/include/angstrom-uclibc.inc         |    1 +
 conf/distro/include/angstrom-uclinux-uclibc.inc |    1 +
 conf/distro/include/slugos.inc                  |    1 +
 conf/distro/minimal-uclibc.conf                 |    1 +
 4 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 6d02578..8993a6a 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -12,6 +12,7 @@ PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
 
 TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d)  in ['bfin']]}"
diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc
index 7d65fc1..e0d4518 100644
--- a/conf/distro/include/angstrom-uclinux-uclibc.inc
+++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
@@ -6,6 +6,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
 
 TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 05853d3..4df4619 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -41,6 +41,7 @@ TARGET_FPU = "soft"
 
 # glib-2.0 builds require USE_NLS to be overridden
 USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
 
 INHERIT += "package_ipk debian"
 
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index db08775..3844d71 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -30,6 +30,7 @@ PREFERRED_PROVIDER_virtual/libintl = "gettext"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
 
 PREFERRED_VERSION_uclibc = "0.9.29"
 PREFERRED_VERSION_uclibc-initial = "0.9.29"