angstrom-uclibc.inc: Disable USE_NLS for gcc-cross

angstrom-uclinux-uclibc.inc: Ditto
slugos.inc: Ditto
minimal-uclibc.conf: Ditto

* uclibc based system gettext gets pulled in to provide libintl and
when gcc-cross is rebuilt then it ends up noticing that it can use
the NLS support and the patches for uclibc locale support in gcc does not
go so well with this. We disable NLS for uclibc based angstroms.

diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 71b8862e4bb311c90b375edd1a00d58bfb18de30..1f0b41f05e1bedc9f750129a6ead210af2e16434 100644 (file)
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -14,6 +14,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"
+USE_NLS_gcc-cross = "no"
 
 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 e0d4518a1ea7dc51139be5bc59b914ec7aea2f67..68ad1458790a74404925afa27e5f3ebef683ee16 100644 (file)
--- a/conf/distro/include/angstrom-uclinux-uclibc.inc
+++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
 
 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 78e9917722ab9335a6aa4dbf32bca54e588d106f..17a3d8d0919cae96a54aa41cd505a8dcc84fcd5e 100644 (file)
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -62,6 +62,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"
+USEE_NLS_gcc-cross = "no"
 
 INHERIT += "package_ipk debian testlab packaged-staging"
 

diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index a64cbf28202bc9afc271916645dd3298211232ef..62eb86ab84496c35c729a791f51b14fa240a868a 100644 (file)
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -31,6 +31,7 @@ PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
 
 PREFERRED_VERSION_uclibc = "0.9.30"
 PREFERRED_VERSION_uclibc-initial = "0.9.30"