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

diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 6d02578df4178b860b0a06d4f15767ced24b0aa6..8993a6ae38b8beac593ce815a30338b99f0cb690 100644 (file)
--- 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 7d65fc1f02a043791dda523a616e29d984c780aa..e0d4518a1ea7dc51139be5bc59b914ec7aea2f67 100644 (file)
--- 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 05853d39361ce7ee12149c89f6b7865286dad6a0..4df461910c8257ff86973c18652dd65c54b1bb15 100644 (file)
--- 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 db08775d4a857451ef047fd4c4a33094b609e221..3844d712d904c25d1f3d0cd9882a793723051604 100644 (file)
--- 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"