From bdeefe1fb263ee9726ab4f2c3372f4e71c16cd2c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 11 Jul 2014 09:31:49 +0200
Subject: simplify uClibc toolchain builds, add uClibc-ng test subpackage

---
 package/uclibc-ng/Config.in.manual | 14 +++++++++++++-
 package/uclibc-ng/Makefile         | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'package/uclibc-ng')

diff --git a/package/uclibc-ng/Config.in.manual b/package/uclibc-ng/Config.in.manual
index 85cdf289e..6e61a2e0b 100644
--- a/package/uclibc-ng/Config.in.manual
+++ b/package/uclibc-ng/Config.in.manual
@@ -1,8 +1,20 @@
 config ADK_PACKAGE_UCLIBC_NG
-	prompt "uClibc-ng............ embedded C library"
+	prompt "uClibc-ng............... embedded C library"
 	bool
 	default y if ADK_TARGET_LIB_UCLIBC_NG && !ADK_TOOLCHAIN_ONLY
 	default n
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 	help
 	  Embedded C library. http://www.uclibc-ng.org
+
+config ADK_PACKAGE_UCLIBC_NG_TEST
+	prompt "uClibc-ng-test.......... embedded C library (testsuite)"
+	bool
+	default n
+	select ADK_PACKAGE_MAKE
+	select ADK_PACKAGE_LIBRT
+	select ADK_PACKAGE_LIBPTHREAD
+	select ADK_UCLIBC_TEST
+	depends on ADK_TARGET_LIB_UCLIBC_NG
+	help
+	  Embedded C library testsuite. http://www.uclibc-ng.org
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile
index c6d5d231c..7bb5df8dc 100644
--- a/package/uclibc-ng/Makefile
+++ b/package/uclibc-ng/Makefile
@@ -13,9 +13,11 @@ PKG_OPTS:=		noremove nostaging noscripts
 PKG_VERSION:=		1.0.0
 BETA:=			beta2
 
-PKG_SUBPKGS:=		UCLIBC_NG UCLIBC_NG_DEV
+PKG_SUBPKGS:=		UCLIBC_NG UCLIBC_NG_DEV UCLIBC_NG_TEST
 PKGSD_UCLIBC_NG_DEV:=	development files for uclibc-ng
 PKGSC_UCLIBC_NG_DEV:=	devel
+PKGSD_UCLIBC_NG_TEST:=	test suite for uclibc-ng
+PKGSS_UCLIBC_NG_TEST:=	make
 
 NO_DISTFILES:=		1
 
@@ -23,6 +25,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,UCLIBC_NG,uclibc-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,UCLIBC_NG_DEV,uclibc-ng-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_UCLIBC_NG_DEV},${PKGSC_UCLIBC_NG_DEV},${PKG_OPTS}))
+$(eval $(call PKG_template,UCLIBC_NG_TEST,uclibc-ng-test,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_UCLIBC_NG_TEST},${PKGSD_UCLIBC_NG_TEST},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
@@ -75,4 +78,13 @@ uclibc-ng-dev-install:
 	@find $(IDIR_UCLIBC_NG_DEV) -name .install -exec rm {} \;
 	@find $(IDIR_UCLIBC_NG_DEV) -name ..install.cmd -exec rm {} \;
 
+uclibc-ng-test-install:
+	${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
+	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)$(BETA)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}$(BETA)/test \
+		${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
+	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)$(BETA)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}$(BETA)/{Rules.mak,.config} \
+		${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
+	find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.c -delete 
+	find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -delete 
+
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3