diff options
| author | Khem Raj <raj.khem@gmail.com> | 2008-12-10 12:13:33 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2008-12-10 12:13:33 -0800 |
| commit | 181447ab2aff8308e7041d1553c16bcfbf796f41 (patch) | |
| tree | 5450443064e6e06b349ccd4746edff4a29922b3b | |
| parent | c83835dca4b2a8f8267066037c86a71474f278c2 (diff) | |
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.
| -rw-r--r-- | conf/distro/include/angstrom-uclibc.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-uclinux-uclibc.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 1 | ||||
| -rw-r--r-- | 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 71b8862e4b..1f0b41f05e 100644 --- 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 e0d4518a1e..68ad145879 100644 --- 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 78e9917722..17a3d8d091 100644 --- 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 a64cbf2820..62eb86ab84 100644 --- 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" |