Changeset 3369

Show
Ignore:
Timestamp:
08/01/07 12:45:18 (1 year ago)
Author:
tg
Message:

commit (not yet working) locale support; I'll have to pregenerate
some of the files on flyingfish since they access glibc interna on
the build system

note: both ISO C99 math and locale support will be made a configure
time option once I'm done fixing this

note 2: we'll only support the β€˜C’ and β€˜en_US.UTF-8’ locales, other
don't make sense; you do get iconv, though.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/toolchain/uClibc/Makefile

    r3341 r3369  
    44# material, please see the LICENCE file in the top-level directory 
    55# or at http://www.freewrt.org/licence for details. 
     6 
     7_IN_CVTC=               1 
    68 
    79include $(TOPDIR)/rules.mk 
    …… 
    1315SOURCE:=                $(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1416MASTER_SITES:=          http://www.uclibc.org/downloads/ 
    15 _IN_CVTC=               1 
    1617 
    1718UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ 
    …… 
    3637        cp files/arc4random.c ${WRKSRC}/libc/stdlib/ 
    3738        cp files/s_round.c ${WRKSRC}/libm/      # from MirBSD libm! 
     39        cp files/{codesets,locales}.txt ${WRKSRC}/extra/locale/ 
    3840        touch $(PKG_BUILD_DIR)/.unpacked 
    3941 
    4042$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked 
     43#           -e 'sUCLIBC_HAS_LOCALE=y# UCLIBC_HAS_LOCALE is not set' \ 
    4144        $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak 
    42         $(CP) ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config 
    43         $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \ 
    44                 $(PKG_BUILD_DIR)/.config 
    45         $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(PKG_BUILD_DIR)/.config 
    46         $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(PKG_BUILD_DIR)/.config 
     45        sed -e 's^KERNEL_SOURCE.*$$KERNEL_SOURCE=\"${LINUX_HEADERS_DIR}\"' \ 
     46            files/config.${ARCH} >${PKG_BUILD_DIR}/.config 
    4747        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/include 
    4848        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/lib 
    …… 
    5858 
    5959$(PKG_BUILD_DIR)/lib/libc.a: $(PKG_BUILD_DIR)/.configured $(LIBFLOAT_TARGET) 
     60#       sed -e 's^KERNEL_SOURCE.*$$KERNEL_SOURCE=\"${LINUX_HEADERS_DIR}\"' \ 
     61#           files/config.${ARCH} >${PKG_BUILD_DIR}/.config 
     62#       ${MAKE} -C ${PKG_BUILD_DIR} oldconfig 
    6063        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    6164                PREFIX= \ 

  • trunk/freewrt/toolchain/uClibc/files/config.arm

    r3338 r3369  
    107107# UCLIBC_HAS_CTYPE_ENFORCED is not set 
    108108UCLIBC_HAS_WCHAR=y 
    109 # UCLIBC_HAS_LOCALE is not set 
     109UCLIBC_HAS_LOCALE=y 
     110# UCLIBC_PREGENERATED_LOCALE_DATA is not set 
     111# UCLIBC_HAS_XLOCALE is not set 
    110112UCLIBC_HAS_HEXADECIMAL_FLOATS=y 
     113# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set 
    111114UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y 
    112115UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 

  • trunk/freewrt/toolchain/uClibc/files/config.armeb

    r3338 r3369  
    107107# UCLIBC_HAS_CTYPE_ENFORCED is not set 
    108108UCLIBC_HAS_WCHAR=y 
    109 # UCLIBC_HAS_LOCALE is not set 
     109UCLIBC_HAS_LOCALE=y 
     110# UCLIBC_PREGENERATED_LOCALE_DATA is not set 
     111# UCLIBC_HAS_XLOCALE is not set 
    110112UCLIBC_HAS_HEXADECIMAL_FLOATS=y 
     113# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set 
    111114UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y 
    112115UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 

  • trunk/freewrt/toolchain/uClibc/files/config.cris

    r3338 r3369  
    9696# UCLIBC_HAS_CTYPE_ENFORCED is not set 
    9797UCLIBC_HAS_WCHAR=y 
    98 # UCLIBC_HAS_LOCALE is not set 
     98UCLIBC_HAS_LOCALE=y 
     99# UCLIBC_PREGENERATED_LOCALE_DATA is not set 
     100# UCLIBC_HAS_XLOCALE is not set 
    99101UCLIBC_HAS_HEXADECIMAL_FLOATS=y 
     102# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set 
    100103UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y 
    101104UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 

  • trunk/freewrt/toolchain/uClibc/files/config.i386

    r3338 r3369  
    111111# UCLIBC_HAS_CTYPE_ENFORCED is not set 
    112112UCLIBC_HAS_WCHAR=y 
    113 # UCLIBC_HAS_LOCALE is not set 
     113UCLIBC_HAS_LOCALE=y 
     114# UCLIBC_PREGENERATED_LOCALE_DATA is not set 
     115# UCLIBC_HAS_XLOCALE is not set 
    114116UCLIBC_HAS_HEXADECIMAL_FLOATS=y 
     117# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set 
    115118UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y 
    116119UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 

  • trunk/freewrt/toolchain/uClibc/files/config.mipsel

    r3338 r3369  
    102102# UCLIBC_HAS_CTYPE_ENFORCED is not set 
    103103UCLIBC_HAS_WCHAR=y 
    104 # UCLIBC_HAS_LOCALE is not set 
     104UCLIBC_HAS_LOCALE=y 
     105# UCLIBC_PREGENERATED_LOCALE_DATA is not set 
     106# UCLIBC_HAS_XLOCALE is not set 
    105107UCLIBC_HAS_HEXADECIMAL_FLOATS=y 
     108# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set 
    106109UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y 
    107110UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 

  • trunk/freewrt/toolchain/uClibc/files/config.powerpc

    r3338 r3369  
    9494# UCLIBC_HAS_CTYPE_ENFORCED is not set 
    9595UCLIBC_HAS_WCHAR=y 
    96 # UCLIBC_HAS_LOCALE is not set 
     96UCLIBC_HAS_LOCALE=y 
     97# UCLIBC_PREGENERATED_LOCALE_DATA is not set 
     98# UCLIBC_HAS_XLOCALE is not set 
    9799UCLIBC_HAS_HEXADECIMAL_FLOATS=y 
     100# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set 
    98101UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y 
    99102UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 

  • trunk/freewrt/toolchain/uClibc/patches/patch-Makefile

    r2822 r3369  
    11$FreeWRT$ 
    2 --- uClibc-0.9.28.orig/Makefile 2005-08-17 22:49:49.000000000 +0000 
    3 +++ uClibc-0.9.28/Makefile      2007-06-15 17:03:18.000000000 +0000 
    4 @@ -158,12 +158,7 @@ install_dev: 
     2--- uClibc-0.9.28.orig/Makefile 2005-08-18 00:49:49.000000000 +0200 
     3+++ uClibc-0.9.28/Makefile      2007-08-01 12:32:53.000000000 +0200 
     4@@ -129,6 +129,7 @@ WGET:=wget --passive-ftp 
     5 LOCALE_DATA_FILENAME:=uClibc-locale-030818.tgz 
     6  
     7 pregen: headers 
     8+ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y) 
     9 ifeq ($(strip $(UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA)),y) 
     10        (cd extra/locale; \ 
     11        if [ ! -f $(LOCALE_DATA_FILENAME) ] ; then \ 
     12@@ -138,6 +139,9 @@ endif 
     13 ifeq ($(strip $(UCLIBC_PREGENERATED_LOCALE_DATA)),y) 
     14        (cd extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -) 
     15        $(MAKE) -C extra/locale pregen 
     16+else 
     17+       $(MAKE) -C extra/locale all 
     18+endif 
     19 endif 
     20  
     21  
     22@@ -158,12 +162,7 @@ install_dev: 
    523        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib 
    624        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include 
    …… 
    1634 ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y) 
    1735        # Remove floating point related headers since float support is disabled. 
    18 @@ -253,7 +248,7 @@ ifeq ($(strip $(HAVE_SHARED)),y) 
     36@@ -253,7 +252,7 @@ ifeq ($(strip $(HAVE_SHARED)),y) 
    1937        $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib 
    2038        $(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \ 
    …… 
    2543            set -e; \ 
    2644                $(SHELL_SET_X); \ 
    27 @@ -370,7 +365,7 @@ distclean: clean 
     45@@ -370,7 +369,7 @@ distclean: clean 
    2846 release: distclean 
    2947        cd ..;                                  \