From 2235d27643c8f10868dda64075ab122e3442efdb Mon Sep 17 00:00:00 2001 From: Marc Andre Tanner Date: Sun, 17 Jan 2010 23:15:40 +0100 Subject: [PATCH] uclibc: disable unneeded features Signed-off-by: Marc Andre Tanner --- sources/configs/miniconfig-uClibc | 12 +-------- .../uClibc-fix-UCLIBC_BUILD_MINIMAL_LOCALE.patch | 30 ---------------------- sources/sections/uClibc.sh | 15 ----------- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 sources/patches/uClibc-fix-UCLIBC_BUILD_MINIMAL_LOCALE.patch diff --git a/sources/configs/miniconfig-uClibc b/sources/configs/miniconfig-uClibc index c7f7461..bea8dac 100644 --- a/sources/configs/miniconfig-uClibc +++ b/sources/configs/miniconfig-uClibc @@ -12,23 +12,16 @@ LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y LDSO_BASE_FILENAME="ld-uClibc.so" UCLIBC_CTOR_DTOR=y -UCLIBC_HAS_THREADS=y -LINUXTHREADS_OLD=y -# this is needed for gdbserver to work properly it will build a libthread_db -PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y +UCLIBC_HAS_REALTIME=y MALLOC_GLIBC_COMPAT=y -UCLIBC_SUSV3_LEGACY=y -UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PTY=y ASSUME_DEVPTS=y UNIX98PTY_ONLY=y UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y UCLIBC_LINUX_SPECIFIC=y UCLIBC_HAS_EPOLL=y UCLIBC_HAS_CRYPT_IMPL=y @@ -63,7 +56,4 @@ UCLIBC_HAS_GNU_GLOB=y UCLIBC_BUILD_RELRO=y UCLIBC_BUILD_NOEXECSTACK=y UCLIBC_EXTRA_CFLAGS="-msoft-float" -# needed to provide functionality of libiconv -# this will also select wide character support -UCLIBC_HAS_LOCALE=y DOSTRIP=y diff --git a/sources/patches/uClibc-fix-UCLIBC_BUILD_MINIMAL_LOCALE.patch b/sources/patches/uClibc-fix-UCLIBC_BUILD_MINIMAL_LOCALE.patch deleted file mode 100644 index 1e88b8e..0000000 --- a/sources/patches/uClibc-fix-UCLIBC_BUILD_MINIMAL_LOCALE.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- uClibc/extra/locale/Makefile.in 2008-11-11 12:05:57.000000000 +0100 -+++ uClibc-patched/extra/locale/Makefile.in 2009-10-10 12:06:11.000000000 +0200 -@@ -92,7 +92,7 @@ - $(locale_OUT)/codesets.txt: - @$(disp_gen) - ifeq ($(UCLIBC_BUILD_MINIMAL_LOCALE),y) -- $(Q)echo "charmaps/ASCII.pairs" > $@ ; \ -+ $(Q)echo "charmaps/ASCII.pairs" > $@ ; - $(Q)echo "charmaps/ISO-8859-1.pairs" >> $@ - else - $(Q)(cd $(locale_DIR)/ && find charmaps/ -name '*.pairs' | sort ) > $@ -@@ -103,12 +103,12 @@ - $(locale_OUT)/locales.txt: $(locale_DIR)/LOCALES - @$(disp_gen) - ifeq ($(UCLIBC_BUILD_MINIMAL_LOCALE),y) -- $(Q)echo "@euro e" > $@ ; \ -- $(Q)echo "#-" >> $@ ; \ -- $(Q)echo "UTF-8 yes" >> $@ ; \ -- $(Q)echo "8-BIT yes" >> $@ ; \ -- $(Q)echo "#-" >> $@ ; \ -- $(Q)echo "en_US.UTF-8 UTF-8" >> $@ ; \ -+ $(Q)echo "@euro e" > $@ ; -+ $(Q)echo "#-" >> $@ ; -+ $(Q)echo "UTF-8 yes" >> $@ ; -+ $(Q)echo "8-BIT yes" >> $@ ; -+ $(Q)echo "#-" >> $@ ; -+ $(Q)echo "en_US.UTF-8 UTF-8" >> $@ ; - $(Q)echo "en_US ISO-8859-1" >> $@ - else - $(Q)cat $< > $@ diff --git a/sources/sections/uClibc.sh b/sources/sections/uClibc.sh index 30bb079..cc7c8a3 100644 --- a/sources/sections/uClibc.sh +++ b/sources/sections/uClibc.sh @@ -16,21 +16,6 @@ cp .config "$CONFIG_DIR/config-uClibc" || dienow UCLIBC_MAKE_FLAGS="CROSS=$CROSS KERNEL_HEADERS=$STAGING_DIR/usr/include \ RUNTIME_PREFIX=/ UCLIBC_LDSO_NAME=ld-uClibc $VERBOSITY" -# prepare the headers files this is a pre requirement for locale generation - -make $UCLIBC_MAKE_FLAGS PREFIX="$STAGING_DIR/usr" DEVEL_PREFIX="/" headers -make $UCLIBC_MAKE_FLAGS PREFIX="$STAGING_DIR/usr" DEVEL_PREFIX="/" include/bits/sysnum.h - -# configure/generate just the minimal needed locales -# UCLIBC_BUILD_MINIMAL_LOCALE doesn't seem to be present -# in the Kconfig files but it is nevertheless used in the -# Makefile - -cd extra/locale -make clean -make $UCLIBC_MAKE_FLAGS PREFIX="$STAGING_DIR/usr" UCLIBC_BUILD_MINIMAL_LOCALE=y DEVEL_PREFIX="/" -cd - >/dev/null - # build and install into $STAGING_DIR make $UCLIBC_MAKE_FLAGS PREFIX="$STAGING_DIR/usr" DEVEL_PREFIX="/" -j $CPUS install && -- 2.11.4.GIT