Kill off uclibc 0.9.21, unless someone else wants to pick up maintainance, and made the uclibc builds obey USE_NLS.

BKrev: 41999d4eyD8ytRyYN1OfZPk4MjH1WA

5 files changed, 8 insertions, 351 deletions

diff --git a/uclibc/uclibc-0.9.21/uClibc.config b/uclibc/uclibc-0.9.21/uClibc.config
deleted file mode 100644
index abe2660b85..0000000000
--- a/uclibc/uclibc-0.9.21/uClibc.config
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Architecture Features and Options
-#
-HAVE_ELF=y
-CONFIG_GENERIC_386=y
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMIII is not set
-# CONFIG_PENTIUM4 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-UCLIBC_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-HAS_FPU=y
-DO_C99_MATH=y
-WARNINGS="-Wall"
-KERNEL_SOURCE="/usr/src/linux"
-C_SYMBOL_PREFIX=""
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-DOPIC=y
-HAVE_SHARED=y
-# ADD_LIBGCC_FUNCTIONS is not set
-BUILD_UCLIBC_LDSO=y
-LDSO_LDD_SUPPORT=y
-UCLIBC_CTOR_DTOR=y
-# UCLIBC_PROFILING is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-MALLOC_930716=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-# UCLIBC_HAS_IPV6 is not set
-UCLIBC_HAS_RPC=y
-# UCLIBC_HAS_FULL_RPC is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_WORDEXP is not set
-# UCLIBC_HAS_FTW is not set
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PATH="/lib"
-DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
-SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)"
-DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
-
-#
-# uClibc development/debugging options
-#
-# DODEBUG is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/uclibc/uclibc-0.9.21/uClibc.config.arm b/uclibc/uclibc-0.9.21/uClibc.config.arm
deleted file mode 100644
index 6897e30eec..0000000000
--- a/uclibc/uclibc-0.9.21/uClibc.config.arm
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Architecture Features and Options
-#
-HAVE_ELF=y
-CONFIG_GENERIC_ARM=y
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-UCLIBC_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-HAS_FPU=y
-DO_C99_MATH=y
-WARNINGS="-Wall"
-KERNEL_SOURCE="/home/gbritton/devel/gb-router/tmp/base/uclibc-0.9.21-r0/linux"
-C_SYMBOL_PREFIX=""
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-DOPIC=y
-HAVE_SHARED=y
-ADD_LIBGCC_FUNCTIONS=y
-BUILD_UCLIBC_LDSO=y
-LDSO_LDD_SUPPORT=y
-UCLIBC_CTOR_DTOR=y
-# UCLIBC_PROFILING is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-MALLOC_930716=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-# UCLIBC_HAS_IPV6 is not set
-UCLIBC_HAS_RPC=y
-# UCLIBC_HAS_FULL_RPC is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_WORDEXP is not set
-# UCLIBC_HAS_FTW is not set
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PATH="/lib"
-DEVEL_PREFIX="/home/gbritton/devel/gb-router/tmp/staging/build"
-SYSTEM_DEVEL_PREFIX="/home/gbritton/devel/gb-router/tmp/staging/build"
-DEVEL_TOOL_PREFIX="/home/gbritton/devel/gb-router/tmp/staging/build"
-
-#
-# uClibc development/debugging options
-#
-# DODEBUG is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/uclibc/uclibc_0.9.21.oe b/uclibc/uclibc_0.9.21.oe
deleted file mode 100644
index 41487e528f..0000000000
--- a/uclibc/uclibc_0.9.21.oe
+++ /dev/null
@@ -1,97 +0,0 @@
-DESCRIPTION = "C library for embedded systems"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc-initial"
-PROVIDES = "virtual/libc"
-PROVIDES += "virtual/libiconv"
-
-SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
-           http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2"
-
-S = "${WORKDIR}/uClibc-${PV}"
-
-UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
-
-EXTRA_OEMAKE = ""
-
-uclibcbuild_do_patch() {
-	rm -f ${WORKDIR}/linux/include/asm
-	ln -sf asm-${TARGET_ARCH} ${WORKDIR}/linux/include/asm
-
-	touch ${WORKDIR}/linux/include/linux/autoconf.h
-
-	echo "#define UTS_RELEASE \"2.4.21\"" > ${WORKDIR}/linux/include/linux/version.h
-	echo "#define LINUX_VERSION_CODE 132117" >> ${WORKDIR}/linux/include/linux/version.h
-	echo "#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))" \
-		>> ${WORKDIR}/linux/include/linux/version.h
-
-	if [ -f ${FILESDIR}/uClibc.config.${TARGET_ARCH} ]; then
-		cp ${FILESDIR}/uClibc.config.${TARGET_ARCH} ${S}/.config
-	else
-		cp ${FILESDIR}/uClibc.config ${S}/.config
-	fi
-
-	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
-	perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"${WORKDIR}/linux\",g' ${S}/.config
-	perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^DEVEL_TOOL_PREFIX=.*,DEVEL_TOOL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH=\"/lib\",g' ${S}/.config
-	perl -i -p -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' ${S}/.config
-	perl -i -p -e 's,^GCC_BIN.*,GCC_BIN=${CROSS_DIR}/bin/${TARGET_PREFIX}gcc,g' ${S}/extra/gcc-uClibc/Makefile
-	perl -i -p -e 's,^LD_BIN.*,LD_BIN=${CROSS_DIR}/bin/${TARGET_PREFIX}ld,g' ${S}/extra/gcc-uClibc/Makefile
-
-	make oldconfig
-	make headers
-}
-
-python do_patch () {
-	oe.build.exec_func('base_do_patch', d)
-	oe.build.exec_func('uclibcbuild_do_patch', d)
-}
-
-do_stage() {
-	make install_dev install_runtime install_utils
-
-	# Make links to ${STAGING_INCDIR} so many
-	# cross builds work easier...
-	mkdir -p ${STAGING_INCDIR}
-	for f in ${CROSS_DIR}/${TARGET_SYS}/include/*; do
-		ln -s $f ${STAGING_INCDIR}/
-	done
-
-	# We don't really need these
-	rmdir ${CROSS_DIR}/${TARGET_SYS}/${libdir} || :
-	rmdir ${CROSS_DIR}/${TARGET_SYS}/${prefix} || :
-}
-
-do_install() {
-	make DEVEL_PREFIX= SYSTEM_DEVEL_PREFIX= TARGET_PREFIX= \
-		DEVEL_TOOL_PREFIX=${prefix} PREFIX=${D} \
-		install_dev install_target install_target_utils
-
-	# binutils has a readelf, so forget about this one...
-	rm -f ${D}/${bindir}/readelf
-
-	# move devel headers/libs/objects from / into ${prefix}
-	mv -f ${D}/lib/*.a ${D}/lib/*.o ${D}${libdir}/
-	rm -f ${D}/include/.cvsignore
-	mv -f ${D}/include ${D}${prefix}/
-	for lib in libc.so libcrypt.so libdl.so libm.so libnsl.so \
-	           libpthread.so libresolv.so libthread_db.so libutil.so; do
-		ln -s ../../lib/`readlink ${D}/lib/$lib` ${D}${libdir}/$lib
-		rm -f ${D}/lib/$lib
-	done
-
-	# ensure we have a /sbin/ldconfig as some scripts expect one
-	if ! [ -e ${D}/sbin/ldconfig ]; then
-		mkdir -p ${D}/sbin
-		ln -sf ../bin/true ${D}/sbin/ldconfig
-	fi
-}
-
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index 2cc8c2cf8b..d9f41ab3e6 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -22,7 +22,7 @@ python __anonymous () {
 }
 
 PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES += "virtual/libiconv"
+PROVIDES += "${@['virtual/libiconv', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}"
 DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \
 	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
@@ -56,7 +56,7 @@ UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
 UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
 
 SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
-	   ${UCLIBC_LOCALE_URI} \
+	   ${@['${UCLIBC_LOCALE_URI}', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']} \
            file://26headers.patch;patch=1 \
            file://nokernelheadercheck.patch;patch=1 \
 	   file://dyn-ldconfig.patch;patch=1 \
@@ -73,7 +73,8 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/in
 		s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \
 		s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \
 		s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
-		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g;'
+		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
+		${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][oe.data.getVar("USE_NLS", d, 1) != "no"]}'
 CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
 
 python () {
diff --git a/uclibc/uclibc_cvs.oe b/uclibc/uclibc_cvs.oe
index 3f76d9153d..2e84583e70 100644
--- a/uclibc/uclibc_cvs.oe
+++ b/uclibc/uclibc_cvs.oe
@@ -24,7 +24,7 @@ python __anonymous () {
 }
 
 PROVIDES += " virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES += "virtual/libiconv"
+PROVIDES += "${@['virtual/libiconv', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}"
 DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \
 	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
@@ -60,7 +60,7 @@ UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
 UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
 
 SRC_URI = "cvs://anonymous:@uclibc.org/var/cvs;module=uClibc \
-	   ${UCLIBC_LOCALE_URI} \
+	   ${@['${UCLIBC_LOCALE_URI}', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']} \
            file://nokernelheadercheck.patch;patch=1 \
 	   file://dyn-ldconfig.patch;patch=1 \
            file://uClibc.config"
@@ -76,7 +76,8 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/in
 		s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \
 		s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \
 		s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
-		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g;'
+		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
+		${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][oe.data.getVar("USE_NLS", d, 1) != "no"]}'
 CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
 
 python () {