浏览代码

- update recommendation for pregenerated locales.
- update name of locale-tarball. We will retroactively fill them in, eventually

Bernhard Reutner-Fischer 16 年之前
父节点
当前提交
ab600d2ad0
共有 3 个文件被更改,包括 11 次插入7 次删除
  1. 2 0
      Rules.mak
  2. 8 6
      extra/Configs/Config.in
  3. 1 1
      extra/locale/Makefile.in

+ 2 - 0
Rules.mak

@@ -98,8 +98,10 @@ LIBC := libc
 SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION)
 SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION)
 ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
 ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
 UCLIBC_LDSO_NAME := ld64-uClibc
 UCLIBC_LDSO_NAME := ld64-uClibc
+ARCH_NATIVE_BIT := 64
 else
 else
 UCLIBC_LDSO_NAME := ld-uClibc
 UCLIBC_LDSO_NAME := ld-uClibc
+ARCH_NATIVE_BIT := 32
 endif
 endif
 UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION)
 UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION)
 NONSHARED_LIBNAME := uclibc_nonshared.a
 NONSHARED_LIBNAME := uclibc_nonshared.a

+ 8 - 6
extra/Configs/Config.in

@@ -1182,15 +1182,17 @@ config UCLIBC_PREGENERATED_LOCALE_DATA
 	default n
 	default n
 	help
 	help
 	  If you are selective and only want locale data for a few particular
 	  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
+	  locales, you can turn this option off.
-	  person, you can turn this option off and manually walk through the
-	  mostly undocumented procedure needed to generate your own locale
-	  data.
 
 
 	  Mere mortals will answer Y and use the default set of pregenerated
 	  Mere mortals will answer Y and use the default set of pregenerated
 	  locale data, which supports 169 UTF-8 locales, and 144 locales for
 	  locale data, which supports 169 UTF-8 locales, and 144 locales for
 	  other codesets (for the complete list see extra/locale/LOCALES).
 	  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
 config UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA
 	bool "Automagically Download the Pre-generated Locale Data (if necessary)"
 	bool "Automagically Download the Pre-generated Locale Data (if necessary)"
 	depends on UCLIBC_PREGENERATED_LOCALE_DATA
 	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
 	  If you would like the build process to use 'wget' to automatically
 	  download the pregenerated locale data, enable this option.  Otherwise
 	  download the pregenerated locale data, enable this option.  Otherwise
 	  you will need to obtain the locale data yourself from:
 	  you will need to obtain the locale data yourself from:
-		http://www.uclibc.org/downloads/uClibc-locale-030818.tgz
+		http://www.uclibc.org/downloads/uClibc-locale-*.tgz
-	  and place the uClibc-locale-030818.tgz tarball in the extra/locale/
+	  and place the uClibc-locale-*.tgz tarball in the extra/locale/
 	  directory.
 	  directory.
 
 
 	  Go ahead and make life easy for yourself... Answer Y.
 	  Go ahead and make life easy for yourself... Answer Y.

+ 1 - 1
extra/locale/Makefile.in

@@ -11,7 +11,7 @@ locale_OUT := $(top_builddir)extra/locale
 # command used to download source code
 # command used to download source code
 WGET := wget --passive-ftp
 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 := \
 BUILD_CFLAGS-locale-common := \
 	-D__UCLIBC_GEN_LOCALE \
 	-D__UCLIBC_GEN_LOCALE \