remove librt/libpthread packages, not required anymore

Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>

49 files changed, 49 insertions, 158 deletions

diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index ae73ee848..56f516768 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -905,14 +905,12 @@ int main() {
 				if (pkg_needs != NULL) {
 					token = strtok(pkg_needs, " ");
 					while (token != NULL) {
-						if (strncmp(token, "threads", 7) == 0)
-							fprintf(cfg, "\tselect ADK_PACKAGE_LIBPTHREAD\n");
-						if (strncmp(token, "rt", 2) == 0)
-							fprintf(cfg, "\tselect ADK_PACKAGE_LIBRT\n");
 						if (strncmp(token, "c++", 3) == 0) {
 							fprintf(cfg, "\tselect ADK_TOOLCHAIN_WITH_CXX\n");
 							fprintf(cfg, "\tselect ADK_PACKAGE_LIBSTDCXX\n");
 						}
+						if (strncmp(token, "threads", 7) == 0)
+							fprintf(cfg, "\tselect ADK_TARGET_LIB_WITH_THREADS\n");
 						if (strncmp(token, "mmu", 3) == 0)
 							fprintf(cfg, "\tdepends on ADK_TARGET_WITH_MMU\n");
 						token = strtok(NULL, " ");
diff --git a/package/Makefile b/package/Makefile
index 8862560eb..7dbb6cfaf 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -20,8 +20,6 @@ package-$(ADK_PACKAGE_UCLIBC_NG) += uclibc-ng
 gcc-compile: uclibc-ng-compile
 endif
 
-package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
-
 include $(ADK_TOPDIR)/package/Depends.mk
 
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y))
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 178e74f85..0c319acc0 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		mixer/player/record utilities
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib
 PKG_BUILDDEP:=		alsa-lib
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/utils/
 
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 37ef8dbaa..6716ae048 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP:=		alsa-lib glib libgtk2 libIDL libX11 mesa libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
 PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host
 PKG_BUILDDEP+=		zip-host
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(PKG_VERSION)/source/
 PKG_NOPARALLEL:=	1
diff --git a/package/git/Makefile b/package/git/Makefile
index c44630369..ee230bac0 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		fast version control system
 PKG_SECTION:=		dev/scm
 PKG_BUILDDEP:=		curl expat libressl
 PKG_DEPENDS:=		libcurl libexpat libressl
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://git-scm.com/
 PKG_SITES:=		https://www.kernel.org/pub/software/scm/git/
 
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual
index 306390665..98fb9cb21 100644
--- a/package/glibc/Config.in.manual
+++ b/package/glibc/Config.in.manual
@@ -1,5 +1,4 @@
 config ADK_PACKAGE_GLIBC
-	prompt "glibc.................... GNU C library"
 	bool
 	default y if ADK_TARGET_LIB_GLIBC && !ADK_APPLIANCE_TOOLCHAIN
 	default n
@@ -9,8 +8,7 @@ config ADK_PACKAGE_GLIBC
 	  GNU C library.
 
 config ADK_PACKAGE_GLIBC_GCONV
-	prompt "glibc-gconv.............. gconv libraries"
-	bool
+	bool "glibc-gconv.............. gconv libraries"
 	default n
 	depends on ADK_TARGET_LIB_GLIBC
 	help
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 18c71438a..fa0cec5e6 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -48,7 +48,7 @@ do-install:
 ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
 	${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH)
-	for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_dns libnss_files; do \
+	for file in libc libpthread librt libcrypt libdl libm libnsl libresolv libutil libnss_dns libnss_files; do \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
 	done
@@ -100,7 +100,7 @@ endif
 endif
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
-	-for file in libcrypt libdl libm libresolv libutil; do \
+	-for file in libpthread librt libcrypt libdl libm libresolv libutil; do \
 		cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VERSION).so $$file.so; \
 	done
 	# header package
diff --git a/package/jack/Makefile b/package/jack/Makefile
index 2fe515be4..694b4f42b 100644
--- a/package/jack/Makefile
+++ b/package/jack/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:=		audio connection kit (v1)
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib libsndfile libsamplerate libdb
 PKG_BUILDDEP:=		db python2-host alsa-lib libsndfile libsamplerate
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://jackaudio.org
 PKG_SITES:=		git://github.com/jackaudio/jack1.git
 
@@ -20,7 +20,6 @@ $(eval $(call PKG_template,JACK,jack,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS
 
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 AUTOTOOL_STYLE:=	autogen
-TARGET_LDFLAGS+=	-lrt
 
 post-extract:
 	(cd $(WRKBUILD); git submodule init)
diff --git a/package/jack2/Makefile b/package/jack2/Makefile
index 2701eee12..0c110c0db 100644
--- a/package/jack2/Makefile
+++ b/package/jack2/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		audio connection kit (v2)
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib libsndfile libsamplerate
 PKG_BUILDDEP:=		python2-host alsa-lib libsndfile libsamplerate
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://jackaudio.org
 PKG_SITES:=		git://github.com/jackaudio/jack2.git
 
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6ffa46693..7753dba16 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		java virtual machine implementation
 PKG_SECTION:=		dev/lang
 PKG_DEPENDS:=		libffi zlib
 PKG_BUILDDEP:=		libffi zlib
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 0686adff3..145b4948e 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -28,7 +28,7 @@ PKG_BUILDDEP+=		libgpg-error dbus libxslt libvorbis libbluray
 PKG_BUILDDEP+=		swig-host liblzo-host libpng-host libjpeg-turbo-host
 PKG_BUILDDEP+=		zip-host unzip-host giflib-host libsquish libdcadec
 PKG_BUILDDEP+=		libcrossguid libressl
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://kodi.tv/
 PKG_SITES:=		https://github.com/xbmc/xbmc/archive/
 
diff --git a/package/libnfc-nci/Makefile b/package/libnfc-nci/Makefile
index cfe2652eb..92bdb6d3a 100644
--- a/package/libnfc-nci/Makefile
+++ b/package/libnfc-nci/Makefile
@@ -9,8 +9,7 @@ PKG_RELEASE:=		1
 PKG_GIT:=		hash
 PKG_DESCR:=		nfc nci library
 PKG_SECTION:=		libs/net
-PKG_DEPENDS:=		nxp-pn5xx
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		https://github.com/NXPNFCLinux/linux_libnfc-nci
 PKG_SITES:=		https://github.com/NXPNFCLinux/linux_libnfc-nci.git
 PKG_OPTS:=		dev
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
deleted file mode 100644
index eb2d87b34..000000000
--- a/package/libpthread/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-include ${ADK_TOPDIR}/toolchain/glibc/Makefile.inc
-endif
-ifeq ($(ADK_TARGET_LIB_MUSL),y)
-include ${ADK_TOPDIR}/toolchain/musl/Makefile.inc
-endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
-include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
-endif
-
-PKG_NAME:=		libpthread
-PKG_DESCR:=		posix threading library
-PKG_SECTION:=		base/libs
-PKG_OPTS:=		noremove nostaging noscripts
-
-NO_DISTFILES:=		1
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-libpthread-install:
-ifneq ($(ADK_TARGET_LIB_MUSL),y)
-ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
-ifneq ($(ADK_TARGET_WITHOUT_THREADS),y)
-ifneq ($(ADK_TARGET_LIB_WITHOUT_THREADS),y)
-ifneq ($(ADK_TARGET_BINFMT_FLAT),y)
-	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
-	-${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
-endif
-endif
-endif
-endif
-endif
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpthread/files/libpthread.so.arm b/package/libpthread/files/libpthread.so.arm
deleted file mode 100644
index 73f6b6c9d..000000000
--- a/package/libpthread/files/libpthread.so.arm
+++ /dev/null
@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-arm)
-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
diff --git a/package/libpthread/files/libpthread.so.x86 b/package/libpthread/files/libpthread.so.x86
deleted file mode 100644
index e7555c820..000000000
--- a/package/libpthread/files/libpthread.so.x86
+++ /dev/null
@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-i386)
-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
diff --git a/package/libpthread/files/libpthread.so.x86_64 b/package/libpthread/files/libpthread.so.x86_64
deleted file mode 100644
index b0e31f904..000000000
--- a/package/libpthread/files/libpthread.so.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf64-x86-64)
-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
diff --git a/package/librt/Makefile b/package/librt/Makefile
deleted file mode 100644
index 14e82988d..000000000
--- a/package/librt/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-include ${ADK_TOPDIR}/toolchain/glibc/Makefile.inc
-endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
-include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
-endif
-
-PKG_NAME:=		librt
-PKG_DESCR:=		realtime library
-PKG_SECTION:=		base/libs
-PKG_OPTS:=		noremove
-
-NO_DISTFILES:=		1
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBRT,librt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-librt-install:
-	${INSTALL_DIR} ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
-ifeq ($(ADK_TARGET_LIB_MUSL),)
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
-ifeq ($(ADK_TARGET_BINFMT_FLAT),)
-	-${CP} ${STAGING_TARGET_DIR}/lib/librt*.so* ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
-endif
-endif
-endif
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ltp/Makefile b/package/ltp/Makefile
index ac45ce7bf..b06707d9a 100644
--- a/package/ltp/Makefile
+++ b/package/ltp/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		linux test project
 PKG_HASH:=		743750de2b024d75983febe9238b7219540a16094f3afeb2de0c9572a9ada655
 PKG_DEPENDS:=		bash mke2fs mkfs
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_SECTION:=		base/tests
 PKG_URL:=		http://linux-test-project.github.io
 PKG_SITES:=		https://github.com/linux-test-project/ltp/releases/download/$(PKG_VERSION)/
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 92829a930..16131ff95 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		logical volume management
 PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libdevmapper libncurses
 PKG_BUILDDEP:=		ncurses util-linux
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://sourceware.org/lvm2/
 PKG_SITES:=		ftp://sources.redhat.com/pub/lvm2/releases/
 PKG_LIBNAME:=		libdevmapper
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 5a9d7391b..05c7365fe 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:=		661ea06fb18df6d2469b2bf824ffd93545a091af185362cbc738d1aa408210c3
 PKG_DESCR:=		small and secure DNS server
 PKG_SECTION:=		net/dns
 PKG_DEPENDS:=		duende
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.maradns.org
 PKG_SITES:=		http://maradns.samiam.org/download/2.0/${PKG_VERSION}/
 PKG_NOPARALLEL:=	1
diff --git a/package/mongrel2/Makefile b/package/mongrel2/Makefile
index e76fb4f5b..8fa6393b2 100644
--- a/package/mongrel2/Makefile
+++ b/package/mongrel2/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		application, language, and network architecture agnostic web server
 PKG_SECTION:=		net/http
 PKG_BUILDDEP:=		zeromq sqlite
 PKG_DEPENDS:=		zeromq libsqlite
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://mongrel2.org
 PKG_SITES:=		https://github.com/mongrel2/mongrel2/releases/download/v$(PKG_VERSION)/
 
diff --git a/package/mosquitto/Makefile b/package/mosquitto/Makefile
index dbf3d8a3b..836e1630b 100644
--- a/package/mosquitto/Makefile
+++ b/package/mosquitto/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		mqtt broker
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		c-ares libressl
 PKG_BUILDDEP:=		cmake-host c-ares libressl
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://mosquitto.org
 PKG_SITES:=		http://mosquitto.org/files/source/
 
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index ad3423112..6fd793d85 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		glib libmpdclient boost libncurses libexpat
 PKG_BUILDDEP:=		glib libmpdclient boost ncurses expat
 PKG_FDEPENDS:=		glib libmpdclient
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.19/
 
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index 90fd2325a..1d015b078 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		mp3 console player
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib
 PKG_BUILDDEP:=		alsa-lib
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.mpg123.de/
 PKG_SITES:=		http://www.mpg123.de/download/
 
diff --git a/package/musl/Config.in.manual b/package/musl/Config.in.manual
index 0a308b988..4552e448d 100644
--- a/package/musl/Config.in.manual
+++ b/package/musl/Config.in.manual
@@ -1,5 +1,4 @@
 config ADK_PACKAGE_MUSL
-	prompt "musl................. embedded C library"
 	bool
 	default y if ADK_TARGET_LIB_MUSL && !ADK_APPLIANCE_TOOLCHAIN
 	default n
diff --git a/package/nodejs/Makefile b/package/nodejs/Makefile
index 9cdfed2c4..d1b4e0ea7 100644
--- a/package/nodejs/Makefile
+++ b/package/nodejs/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		asynchronous event driven framework
 PKG_SECTION:=		net/http
 PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		python2-host zlib
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		https://nodejs.org/
 PKG_SITES:=		https://nodejs.org/dist/v$(PKG_VERSION)/
 
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index f9d9edfce..327b7ce11 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -18,7 +18,7 @@ HOST_BUILDDEP+=		cups-host qemu-host alsa-lib-host freetype-host	libxslt-host
 PKG_DEPENDS:=		zlib libffi libxtst libxi cups gconf
 PKG_DEPENDS+=		libfreetype libxrender libx11 libxext nss libjpeg-turbo
 PKG_DEPENDS+=		libpng giflib libgtk2 glib fontconfig libncurses
-PKG_NEEDS:=		threads c++ rt
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://icedtea.classpath.org/download/source/
 
diff --git a/package/openjdk8/Makefile b/package/openjdk8/Makefile
index bbc8c4ddb..aee7fd93e 100644
--- a/package/openjdk8/Makefile
+++ b/package/openjdk8/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		alsa-lib freetype libx11 libxext libxrender libxtst
 PKG_DEPENDS+=		libxt libffi zlib
 PKG_BUILDDEP:=		openjdk7-host libX11 libXext libXrender libXtst libXt
 PKG_BUILDDEP+=		freetype alsa-lib cups libffi zlib
-PKG_NEEDS:=             threads c++ rt
+PKG_NEEDS:=             threads c++
 PKG_URL:=		http://openjdk.org/
 PKG_HG:=		http://hg.openjdk.java.net/jdk8u/jdk8u
 PKG_SITES:=		${PKG_HG}/archive/
diff --git a/package/perl/Makefile b/package/perl/Makefile
index 4d93b4570..9423db294 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27
 PKG_DESCR:=		perl interpreter
 PKG_SECTION:=		dev/lang
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.perl.org/
 PKG_SITES:=		http://www.cpan.org/src/
 PKG_NOPARALLEL:=	1
diff --git a/package/php/Makefile b/package/php/Makefile
index 7393a6478..5e0a35a7e 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		7535cd6e20040ccec4594cc386c6f15c3f2c88f24163294a31068cf7dfe7f644
 PKG_DESCR:=		php language interpreter
 PKG_SECTION:=		dev/lang
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PHP_URL:=		http://www.php.net/
 PKG_SITES:=		http://de.php.net/distributions/
 
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index 575858a61..20cf4de92 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -14,7 +14,7 @@ PKG_DEPENDS+=		libflac libvorbis libogg libuuid libsndfile
 PKG_DEPENDS+=		alsa-lib
 PKG_BUILDDEP:=		libtool json-c libsndfile speex
 PKG_BUILDDEP+=		flac libvorbis libogg util-linux ncurses alsa-lib
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
 PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
 PKG_OPTS:=		dev
diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index c821a4f66..26e508d80 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -10,8 +10,8 @@ PKG_HASH:=		de4b4b398d5ba81ab2544729864676a04ddc6ae818b357ee09a8770293740cd3
 PKG_DESCR:=		directfb getty replacement
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		directfb libncurses
-PKG_NEEDS:=		threads rt c++
 PKG_BUILDDEP:=		DirectFB ncurses
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://qingy.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=qingy/}
 
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index ba1b936bd..b26aad822 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:=		034e21f87164f44f1c4c89d8fafed4acede298fe3fafbf9277f079544178c66b
 PKG_DESCR:=		routing software package
 PKG_SECTION:=		net/route
 PKG_BUILDDEP:=		readline ncurses
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.quagga.net/
 PKG_SITES:=		http://download.savannah.gnu.org/releases/quagga/
 
diff --git a/package/rsyslog/Makefile b/package/rsyslog/Makefile
index 73d5cc2b8..cbd9905b6 100644
--- a/package/rsyslog/Makefile
+++ b/package/rsyslog/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		1
 PKG_HASH:=		bdb1fde87b75107b58d1cd5d00408822fb15b9f3efb8d9dbb93a1dee128339ab
 PKG_DESCR:=		syslog daemon
 PKG_SECTION:=		sys/misc
-PKG_BUILDDEP:=		libestr liblogging libfastjson util-linux zlib ncurses
 PKG_DEPENDS:=		libestr liblogging libfastjson libuuid zlib libncurses
-PKG_NEEDS:=		threads rt
+PKG_BUILDDEP:=		libestr liblogging libfastjson util-linux zlib ncurses
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.rsyslog.com/
 PKG_SITES:=		http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/package/rt-tests/Makefile b/package/rt-tests/Makefile
index c18f35593..fb13fba55 100644
--- a/package/rt-tests/Makefile
+++ b/package/rt-tests/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:=		bddffd32c9483318fe72d02183981bdcf006d9dc
 PKG_RELEASE:=		1
 PKG_GIT:=		hash
 PKG_DESCR:=		realtime test apps
-PKG_NEEDS:=		threads rt
 PKG_SECTION:=		base/tests
+PKG_NEEDS:=		threads
 PKG_SITES:=		git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index c06b3d0c1..dc7fc6057 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		scripting language
 PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		ruby-host
 HOST_BUILDDEP:=		readline-host
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.ruby-lang.org/
 PKG_SITES:=		http://ftp.ruby-lang.org/pub/ruby/2.3/
 PKG_NOPARALLEL:=	1
diff --git a/package/samba/Makefile b/package/samba/Makefile
index aabd5748f..548224176 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -9,10 +9,10 @@ PKG_RELEASE:=		1
 PKG_HASH:=		d3a9a439b746ddd2c5f119f60c72ef8a026bcee1efb1199bf19e44f114f6b586
 PKG_DESCR:=		file and print server
 PKG_SECTION:=		net/fs
+PKG_DEPENDS:=		libuuid libpopt libgnutls libtirpc
 PKG_BUILDDEP:=		gettext-tiny util-linux popt python2 gnutls
 PKG_BUILDDEP+=		heimdal-host python2-host libtirpc
-PKG_DEPENDS:=		libuuid libpopt libgnutls libtirpc
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
 
diff --git a/package/sox/Makefile b/package/sox/Makefile
index daa64e41d..b84cc160e 100644
--- a/package/sox/Makefile
+++ b/package/sox/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		1
 PKG_HASH:=		b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c
 PKG_DESCR:=		swiss army knife of sound processing programs
 PKG_SECTION:=		mm/audio
-PKG_BUILDDEP:=		zlib ncurses
 PKG_DEPENDS:=		zlib libncurses
-PKG_NEEDS:=		threads rt
+PKG_BUILDDEP:=		zlib ncurses
+PKG_NEEDS:=		threads
 PKG_URL:=		http://sox.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sox/}
 
diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile
index a209e6294..b805930c4 100644
--- a/package/squeezelite/Makefile
+++ b/package/squeezelite/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		headless squeezebox emulator
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		libflac alsa-lib libvorbis libmad libfaad2
 PKG_BUILDDEP:=		alsa-lib libmad flac libvorbis mpg123 faad2
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		https://github.com/ralph-irving/squeezelite
 PKG_SITES:=		https://github.com/ralph-irving/squeezelite.git
 
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 65cf4c0f5..3c2ba14be 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		web and cache proxy
 PKG_SECTION:=		net/proxy
 PKG_DEPENDS:=		libltdl
 PKG_BUILDDEP:=		libtool
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.squid-cache.org/
 PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.5/
 
diff --git a/package/transmission/Makefile b/package/transmission/Makefile
index 900e53d42..c55760760 100644
--- a/package/transmission/Makefile
+++ b/package/transmission/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		1
 PKG_HASH:=		3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f
 PKG_DESCR:=		torrent client
 PKG_SECTION:=		app/p2p
-PKG_BUILDDEP:=		libressl libevent curl
 PKG_DEPENDS:=		libressl libevent libcurl
-PKG_NEEDS:=		threads rt
+PKG_BUILDDEP:=		libressl libevent curl
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.transmissionbt.com
 PKG_SITES:=		http://download.transmissionbt.com/files/
 
diff --git a/package/uclibc-ng/Config.in.manual b/package/uclibc-ng/Config.in.manual
index 69f6c89bb..a8f72eecf 100644
--- a/package/uclibc-ng/Config.in.manual
+++ b/package/uclibc-ng/Config.in.manual
@@ -8,8 +8,6 @@ config ADK_PACKAGE_UCLIBC_NG
 
 config ADK_PACKAGE_UCLIBC_NG_TEST
 	bool "uClibc-ng-test.......... embedded C library (testsuite)"
-	select ADK_PACKAGE_LIBRT if !ADK_TARGET_UCLINUX
-	select ADK_PACKAGE_LIBPTHREAD if !ADK_TARGET_UCLINUX
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 	default n
 	help
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 09f8a03d3..e4f3cb68f 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		program to list usb devices
 PKG_SECTION:=		sys/hw
 PKG_DEPENDS:=		libusb libusb-compat libudev
 PKG_BUILDDEP:=		libusb libusb-compat eudev
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/usb/usbutils/
 PKG_BB:=		1
 
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 4362d1a6d..dd95c4c90 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -11,9 +11,9 @@ PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		ncurses
 HOST_BUILDDEP:=		autoconf-host automake-host libtool-host pkgconf-host
+PKG_NEEDS:=		threads
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.28/
 PKG_OPTS:=		dev
-PKG_NEEDS:=		threads rt
 
 PKG_SUBPKGS:=		FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
 PKG_SUBPKGS+=		LIBFDISK LIBUUID LIBBLKID LIBMOUNT CFDISK MKFS
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index bebe85382..149a44fb6 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		1
 PKG_HASH:=		1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be
 PKG_DESCR:=		popular media player
 PKG_SECTION:=		mm/video
-PKG_BUILDDEP:=		ffmpeg xcb-util libgcrypt alsa-lib
 PKG_DEPENDS:=		libffmpeg xcb-util libgcrypt alsa-lib
-PKG_NEEDS:=		threads rt
+PKG_BUILDDEP:=		ffmpeg xcb-util libgcrypt alsa-lib
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
 
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 12615ceab..1cfafb014 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		wpa supplicant
 PKG_SECTION:=		net/wifi
 PKG_DEPENDS:=		libnl
 PKG_BUILDDEP:=		libnl
-PKG_NEEDS:=		threads rt
+PKG_NEEDS:=		threads
 PKG_URL:=		http://hostap.epitest.fi/wpa_supplicant/
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 3f65ebca5..7d13795e6 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		1
 PKG_HASH:=		88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7
 PKG_DESCR:=		utilities for xfs filesystems
 PKG_SECTION:=		sys/fs
-PKG_BUILDDEP:=		e2fsprogs ncurses
 PKG_DEPENDS:=		libuuid libncurses
-PKG_NEEDS:=		threads rt
+PKG_BUILDDEP:=		e2fsprogs ncurses
+PKG_NEEDS:=		threads
 PKG_URL:=		http://oss.sgi.com/projects/xfs
 PKG_SITES:=		ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 			ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 9c2e59e61..a9fc009a0 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -19,7 +19,7 @@ PKG_BUILDDEP+=		scrnsaverproto resourceproto fontsproto videoproto
 PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont pixman
 PKG_BUILDDEP+=		libpciaccess xf86dgaproto recordproto
 PKG_BUILDDEP+=		xineramaproto presentproto xf86driproto glproto mesa
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		http://www.x.org/releases/individual/xserver/
 PKG_OPTS:=		dev
diff --git a/package/zeromq/Makefile b/package/zeromq/Makefile
index 031cb2ac5..aa920ca40 100644
--- a/package/zeromq/Makefile
+++ b/package/zeromq/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf
 PKG_DESCR:=		transport layer for distributed apps
 PKG_SECTION:=		libs/misc
-PKG_NEEDS:=		threads rt c++
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.zeromq.org
 PKG_SITES:=		https://github.com/zeromq/zeromq4-1/releases/download/v$(PKG_VERSION)/
 PKG_OPTS:=		dev