remove already disabled uClibc support, fix wrong PKG_LIBC_DEPENDS

60 files changed, 50 insertions, 16083 deletions

diff --git a/adk/tools/depmaker.c b/adk/tools/depmaker.c
index cee66eaee..dfcd76c9d 100644
--- a/adk/tools/depmaker.c
+++ b/adk/tools/depmaker.c
@@ -229,9 +229,7 @@ int main() {
 							string[strlen(string)-1] = '\0';
 							key = strtok(string, ":=");
 							dpkg = strdup(key+13);
-							if (strncmp("UCLIBC", dpkg, 6) == 0) {
-								tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 2, &prefix);
-							} else if (strncmp("UCLIBC_NG", dpkg, 9) == 0) {
+							if (strncmp("UCLIBC_NG", dpkg, 9) == 0) {
 								tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 2, &prefix);
 							} else if (strncmp("MUSL", dpkg, 4) == 0) {
 								tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 2, &prefix);
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index cde0f178d..4dce5ada1 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -414,13 +414,6 @@ int main() {
 	fprintf(cfg, "\tdepends on ADK_TARGET_LIB_UCLIBC_NG\n");
 	fprintf(cfg, "\thelp\n");
 	fprintf(cfg, "\t  C library header files.\n\n");
-	fprintf(cfg, "config ADK_PACKAGE_UCLIBC_DEV\n");
-	fprintf(cfg, "\tprompt \"uclibc-dev........... development files for uclibc\"\n");
-	fprintf(cfg, "\tboolean\n");
-	fprintf(cfg, "\tdefault n\n");
-	fprintf(cfg, "\tdepends on ADK_TARGET_LIB_UCLIBC\n");
-	fprintf(cfg, "\thelp\n");
-	fprintf(cfg, "\t  C library header files.\n\n");
 	fprintf(cfg, "config ADK_PACKAGE_MUSL_DEV\n");
 	fprintf(cfg, "\tprompt \"musl-dev............. development files for musl\"\n");
 	fprintf(cfg, "\tboolean\n");
@@ -941,7 +934,7 @@ int main() {
 					fprintf(cfg, "prompt \"C++ library to use\"\n");
 					fprintf(cfg, "depends on ADK_COMPILE_%s\n\n", toupperstr(pkgdirp->d_name));
 					fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC\n", pkg_cxx);
-					fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC\n\n", pkg_cxx);
+					fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC_NG\n\n", pkg_cxx);
 					fprintf(cfg, "config ADK_COMPILE_%s_WITH_STDCXX\n", pkg_cxx);
 					fprintf(cfg, "\tbool \"GNU C++ library\"\n");
 					fprintf(cfg, "\tselect ADK_PACKAGE_LIBSTDCXX\n\n");
diff --git a/docs/adding-packages-directory.txt b/docs/adding-packages-directory.txt
index 45b7630dd..020605275 100644
--- a/docs/adding-packages-directory.txt
+++ b/docs/adding-packages-directory.txt
@@ -43,7 +43,7 @@ are space separated and can be negated with ! as a prefix.
 
 * Target C library
 ** variable used PKG_LIBC_DEPENDS
-** allowed values are: uclibc-ng uclibc glibc musl
+** allowed values are: uclibc-ng glibc musl
 
 * Host system
 ** variable used PKG_HOST_DEPENDS
diff --git a/docs/configure.txt b/docs/configure.txt
index 5dd4690fb..3726478c1 100644
--- a/docs/configure.txt
+++ b/docs/configure.txt
@@ -38,9 +38,8 @@ target system uses ARM, the regular compilation toolchain on your host
 runs on x86 and generates code for x86, while the cross-compilation
 toolchain runs on x86 and generates code for ARM.
 
-You can choose between four C libraries:
+You can choose between three C libraries:
 http://www.uclibc-ng.org[uClibc-ng],
-http://www.uclibc.org[uClibc],
 http://www.gnu.org/software/libc/libc.html[glibc] and
 http://www.musl-libc.org[musl].
 
diff --git a/docs/customize-libc-config.txt b/docs/customize-libc-config.txt
index ec6e50ff6..ac183172a 100644
--- a/docs/customize-libc-config.txt
+++ b/docs/customize-libc-config.txt
@@ -5,8 +5,7 @@
 Customizing the libc configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Just like xref:busybox-custom[BusyBox], http://www.uclibc.org/[uClibc]
-and http://www.uclibc-ng.org/[uClibc-ng]
+Just like xref:busybox-custom[BusyBox] http://www.uclibc-ng.org/[uClibc-ng]
 offering a lot of configuration options. They allow you to select
 various functionalities depending on your needs and limitations.
 OpenADK chooses automatically the best configuration regarding 
@@ -14,16 +13,16 @@ resulting code size, standard conformance, portability and GNU
 libc compatibility.
 
 If you still have the requirements to change the default, regenerate
-a new uClibc/uClibc-ng config from the existing one:
+a new uClibc-ng config from the existing one:
 
 ----------------
- $ tar xvf dl/uClibc-x.y.z.tar.bz2
- $ cd uClibc-x.y.z && patch -p1 <../toolchain/uClibc/patches-x.y.z/*.patch
+ $ tar xvf dl/uClibc-ng-x.y.z.tar.xz
+ $ cd uClibc-ng-x.y.z
  $ cp ../target/<arch>/uclibc.config .config
  $ make menuconfig
 ----------------
 
-Make all required changes. Then copy the newly created uClibc configuration back
+Make all required changes. Then copy the newly created uClibc-ng configuration back
 and rebuild your targetsystem, including the toolchain components:
 
 ----------------
@@ -31,5 +30,4 @@ and rebuild your targetsystem, including the toolchain components:
  $ cd .. && make cleandir && make
 ----------------
 
-The config is shared by uClibc and uClibc-ng.
 There are no customization options for GNU libc or musl available.
diff --git a/mk/build.mk b/mk/build.mk
index e0a298215..9e6b97b24 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -113,7 +113,7 @@ POSTCONFIG=		-@\
 			fi; \
 		done; \
 		if [ "$$(grep ^ADK_RUNTIME_TIMEZONE .config|md5sum)" != "$$(grep ^ADK_RUNTIME_TIMEZONE .config.old|md5sum)" ];then \
-			touch .rebuild.musl .rebuild.uclibc .rebuild.uclibc-ng .rebuild.glibc;\
+			touch .rebuild.musl .rebuild.uclibc-ng .rebuild.glibc;\
 			rebuild=1;\
 		fi; \
 		if [ "$$(grep ^ADK_RUNTIME_SSH_PUBKEY .config|md5sum)" != "$$(grep ^ADK_RUNTIME_SSH_PUBKEY .config.old|md5sum)" ];then \
@@ -340,9 +340,6 @@ endif
 		if [ "$(ADK_TARGET_LIBC)" = "glibc" ];then \
 			echo "ADK_TARGET_LIB_GLIBC_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
 		fi; \
-		if [ "$(ADK_TARGET_LIBC)" = "uclibc" ];then \
-			echo "ADK_TARGET_LIB_UCLIBC_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
-		fi; \
 		if [ "$(ADK_TARGET_LIBC)" = "uclibc-ng" ];then \
 			echo "ADK_TARGET_LIB_UCLIBC_NG_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
 		fi; \
@@ -368,12 +365,6 @@ endif
 		echo "ADK_PACKAGE_FILE=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_UCLIBC_NG_TEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(ADK_TEST_UCLIBC_TESTSUITE)" ];then \
-		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_FILE=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_UCLIBC_TEST=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_MAKE=y" >> $(ADK_TOPDIR)/.defconfig; \
-	fi
 	@if [ ! -z "$(ADK_TEST_MUSL_TESTSUITE)" ];then \
 		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_FILE=y" >> $(ADK_TOPDIR)/.defconfig; \
@@ -394,14 +385,6 @@ endif
 		echo "ADK_PACKAGE_MAKE=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_UCLIBC_NG_DEV=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(ADK_TEST_UCLIBC_NATIVE)" ];then \
-		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_FILE=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_GCC=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_BINUTILS=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_MAKE=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_PACKAGE_UCLIBC_DEV=y" >> $(ADK_TOPDIR)/.defconfig; \
-	fi
 	@if [ ! -z "$(ADK_TEST_MUSL_NATIVE)" ];then \
 		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_FILE=y" >> $(ADK_TOPDIR)/.defconfig; \
diff --git a/mk/package.mk b/mk/package.mk
index 3b27d1278..e0bd141cf 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -287,7 +287,6 @@ $$(INFO_$(1)_DBG): $$(IPKG_$(1)_DBG)
 	$(PKG_INSTALL) $$(IPKG_$(1)_DBG)
 
 ifneq ($(1),UCLIBC_NG)
-ifneq ($(1),UCLIBC)
 ifneq ($(1),GLIBC)
 ifneq ($(1),MUSL)
 $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV)
@@ -295,7 +294,6 @@ $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV)
 endif
 endif
 endif
-endif
 
 endef
 
diff --git a/package/Makefile b/package/Makefile
index a5b851d02..98571fa4a 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -15,12 +15,6 @@ package-$(ADK_PACKAGE_MUSL) += musl
 gcc-compile: musl-compile
 endif
 
-ifeq (${ADK_TARGET_LIB_UCLIBC},y)
-package-$(ADK_PACKAGE_UCLIBC) += uclibc
-package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
-gcc-compile: uclibc-compile
-endif
-
 ifeq (${ADK_TARGET_LIB_UCLIBC_NG},y)
 package-$(ADK_PACKAGE_UCLIBC_NG) += uclibc-ng
 package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
diff --git a/package/afpfs-ng/Makefile b/package/afpfs-ng/Makefile
index 38d013e31..9eba2fb6e 100644
--- a/package/afpfs-ng/Makefile
+++ b/package/afpfs-ng/Makefile
@@ -29,7 +29,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,AFPFS_NG,afpfs-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBAFPCLIENT,libafpclient,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBAFPCLIENT},${PKGSD_LIBAFPCLIENT},${PKGSC_LIBAFPCLIENT},$(PKG_OPTS)))
 
-ifeq ($(ADK_TARGET_LIB_UCLIBC)$(ADK_TARGET_LIB_UCLIBC_NG),y)
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 TARGET_LDFLAGS+=	-liconv
 endif
 
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 2796f885c..cc69dc834 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://www.sixxs.net/
 PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 PKG_CFLINE_AICCU:=	select ADK_KERNEL_TUN m
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.gz
 WRKDIST=		${WRKDIR}/$(PKG_NAME)
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 7934f89f6..3b341df17 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -17,7 +17,7 @@ PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
 PKG_SUBPKGS+=		ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index b8892ef8c..ca0355cf7 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=atftp/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc uclibc-ng glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 PKG_SUBPKGS:=		ATFTP ATFTPD
 PKGSD_ATFTPD:=		tftp server
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 9d43572f0..60033a402 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -16,7 +16,6 @@ PKG_SITES:=		$(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/)
 PKG_LIBNAME:=		libatk
 PKG_OPTS:=		dev
 
-PKG_BUILDDEP_UCLIBC:=	gettext-tiny
 PKG_BUILDDEP_UCLIBC_NG:=gettext-tiny
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index ce8419d8c..07e0a4e28 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux/
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index 65638a004..29b78c904 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index e9b146554..b55c995f7 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:=		wake-on-lan client
 PKG_SECTION:=		net/misc
 PKG_BB:=		1
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 NO_DISTFILES:=		1
 
 include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index d223106d7..ad61b9a20 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -15,7 +15,7 @@ PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index efb253c16..e42604d2f 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		setserial
 PKG_URL:=		http://heyu.tanj.com/
 PKG_SITES:=		http://heyu.tanj.com/download/
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index 8554a22da..c771132e2 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.nobiscuit.com/iptables-snmp/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 7be8defe1..6b313b45f 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -6,9 +6,6 @@ include ${ADK_TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${ADK_TOPDIR}/toolchain/glibc/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
@@ -19,7 +16,7 @@ PKG_SECTION:=		base/libs
 PKG_OPTS:=		noremove
 
 PKG_DFLT_LIBGCC:=	y if !(ADK_TOOLCHAIN_ONLY)
-PKG_LIBC_DEPENDS:=	uclibc uclibc-ng glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 
 NO_DISTFILES:=		1
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index 0ae8dfe78..da34c1631 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -17,7 +17,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 6ccbcb430..1b9663769 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -12,9 +12,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 
 PKG_NAME:=		libpthread
 PKG_DESCR:=		posix threading library
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index 280f2fc5a..75d192d67 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -16,7 +16,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/package/librt/Makefile b/package/librt/Makefile
index 141735347..aabac631b 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -9,9 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 
 PKG_NAME:=		librt
 PKG_DESCR:=		realtime library
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 771754d0b..5c05ee144 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -9,9 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 include ${ADK_TOPDIR}/toolchain/musl/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index de7254446..90bbc9d90 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -12,9 +12,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 
 PKG_NAME:=		libthread-db
 PKG_DESCR:=		posix threads library for gdb/gdbserver
diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile
index cce139329..1546c4ffa 100755
--- a/package/libunistring/Makefile
+++ b/package/libunistring/Makefile
@@ -13,7 +13,7 @@ PKG_URL:=		http://www.gnu.org/software/libunistring/
 PKG_SITES:=		${MASTER_SITE_GNU:=libunistring/}
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index 18d90de7a..19b8406d7 100644
--- a/package/lsof/Makefile
+++ b/package/lsof/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libtirpc
 PKG_URL:=		http://people.freebsd.org/~abe/
 PKG_SITES:=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index 9053cde1c..910dce00b 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		ftp://ftp.bitwizard.nl/mtr/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/ndisc6/Makefile b/package/ndisc6/Makefile
index ff9293be9..7f2422b60 100644
--- a/package/ndisc6/Makefile
+++ b/package/ndisc6/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		net/ipv6
 PKG_URL:=		http://www.remlab.net/
 PKG_SITES:=		http://www.remlab.net/files/ndisc6/
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 PKG_SUBPKGS:=		NDISC6 RDISC6 TCPTRACEROUTE6
 PKGSD_NDI