summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-11-11 11:05:57 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-11-11 11:05:57 +0000
commitab600d2ad03275a963ac95eff51e8c967ef0ffce (patch)
tree805083c2f163acde994ccc21ac4fa5fdaf277a07
parentfc78e7871ef27618239845e9383c628521935df8 (diff)
- update recommendation for pregenerated locales.
- update name of locale-tarball. We will retroactively fill them in, eventually
-rw-r--r--Rules.mak2
-rw-r--r--extra/Configs/Config.in14
-rw-r--r--extra/locale/Makefile.in2
3 files changed, 11 insertions, 7 deletions
diff --git a/Rules.mak b/Rules.mak
index 261babdff..ca6e49f4b 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -98,8 +98,10 @@ LIBC := libc
SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION)
ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
UCLIBC_LDSO_NAME := ld64-uClibc
+ARCH_NATIVE_BIT := 64
else
UCLIBC_LDSO_NAME := ld-uClibc
+ARCH_NATIVE_BIT := 32
endif
UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION)
NONSHARED_LIBNAME := uclibc_nonshared.a
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 86774f7f3..9e2112c84 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -1182,15 +1182,17 @@ config UCLIBC_PREGENERATED_LOCALE_DATA
default n
help
If you are selective and only want locale data for a few particular
- locales, or you enjoy pain, or you are a rabid do-it-yourself sort of
- person, you can turn this option off and manually walk through the
- mostly undocumented procedure needed to generate your own locale
- data.
+ locales, you can turn this option off.
Mere mortals will answer Y and use the default set of pregenerated
locale data, which supports 169 UTF-8 locales, and 144 locales for
other codesets (for the complete list see extra/locale/LOCALES).
+ Note that these pregenerated locales are sensitive to your
+ target architecture (endianess, bitcount).
+
+ Saying N here is recommended.
+
config UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA
bool "Automagically Download the Pre-generated Locale Data (if necessary)"
depends on UCLIBC_PREGENERATED_LOCALE_DATA
@@ -1199,8 +1201,8 @@ config UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA
If you would like the build process to use 'wget' to automatically
download the pregenerated locale data, enable this option. Otherwise
you will need to obtain the locale data yourself from:
- http://www.uclibc.org/downloads/uClibc-locale-030818.tgz
- and place the uClibc-locale-030818.tgz tarball in the extra/locale/
+ http://www.uclibc.org/downloads/uClibc-locale-*.tgz
+ and place the uClibc-locale-*.tgz tarball in the extra/locale/
directory.
Go ahead and make life easy for yourself... Answer Y.
diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in
index 920e0f81c..b4801b04b 100644
--- a/extra/locale/Makefile.in
+++ b/extra/locale/Makefile.in
@@ -11,7 +11,7 @@ locale_OUT := $(top_builddir)extra/locale
# command used to download source code
WGET := wget --passive-ftp
-LOCALE_DATA_FILENAME := uClibc-locale-030818.tgz
+LOCALE_DATA_FILENAME := uClibc-locale-20081111-$(ARCH_NATIVE_BIT)-$(if $(ARCH_LITTLE_ENDIAN),el,eb).tgz
BUILD_CFLAGS-locale-common := \
-D__UCLIBC_GEN_LOCALE \