summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/uclibc-ng/Config.in.manual14
-rw-r--r--package/uclibc-ng/Makefile14
-rw-r--r--toolchain/uclibc-ng/Makefile8
-rw-r--r--toolchain/uclibc/Makefile13
4 files changed, 36 insertions, 13 deletions
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
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 5da2038dc..303d97e63 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -114,16 +114,16 @@ $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled
touch $@
$(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers
- touch $@
-
-$(WRKBUILD)/.fixup:
PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
PREFIX=$(STAGING_TARGET_DIR) \
DEVEL_PREFIX=/usr/ \
DEVEL_PREFIX_LIB=/ \
RUNTIME_PREFIX=/ \
CPU_CFLAGS="$(TARGET_CFLAGS)" \
- all install_runtime
+ install_runtime
+ touch $@
+
+$(WRKBUILD)/.fixup:
ifeq ($(ADK_UCLIBC_TEST),y)
PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
UCLIBC_ONLY=1 \
diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile
index fe1a843e9..a4c1a3fdc 100644
--- a/toolchain/uclibc/Makefile
+++ b/toolchain/uclibc/Makefile
@@ -102,22 +102,21 @@ $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled
touch $@
$(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers
- touch $@
-
-$(WRKBUILD)/.fixup:
PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
PREFIX=$(STAGING_TARGET_DIR) \
DEVEL_PREFIX=/usr/ \
DEVEL_PREFIX_LIB=/ \
RUNTIME_PREFIX=/ \
CPU_CFLAGS="$(TARGET_CFLAGS)" \
- all install_runtime
+ install_runtime
+ touch $@
+
+$(WRKBUILD)/.fixup:
ifeq ($(ADK_UCLIBC_TEST),y)
- PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD)/test \
+ PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
UCLIBC_ONLY=1 \
- TEST_INSTALLED_UCLIBC=1 \
CPU_CFLAGS="$(TARGET_CFLAGS)" \
- compile
+ test_compile
endif
ifeq ($(ADK_TARGET_TOOLCHAIN),y)
# cleanup toolchain