From a23e506202ffa96390759bcb492e23260ab37dc0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 Oct 2016 20:32:53 +0200 Subject: uclibc-ng: separate test suite from uClibc-ng package --- adk/tools/depmaker.c | 3 +-- package/gdb/Makefile | 1 + package/uclibc-ng-test/Makefile | 36 ++++++++++++++++++++++++++++++++++++ package/uclibc-ng/Config.in.manual | 7 ------- package/uclibc-ng/Makefile | 13 +------------ toolchain/uclibc-ng/Makefile | 13 ------------- 6 files changed, 39 insertions(+), 34 deletions(-) create mode 100644 package/uclibc-ng-test/Makefile diff --git a/adk/tools/depmaker.c b/adk/tools/depmaker.c index ac62da2d0..ad2328d9e 100644 --- a/adk/tools/depmaker.c +++ b/adk/tools/depmaker.c @@ -221,8 +221,7 @@ int main() { /* exclude manual maintained packages from package/Makefile */ if ( - !(strncmp(pkgdirp->d_name, "libpthread", 10) == 0 && strlen(pkgdirp->d_name) == 10) && - !(strncmp(pkgdirp->d_name, "uclibc-ng", 9) == 0) && + !(strncmp(pkgdirp->d_name, "uclibc-ng", 9) == 0 && strlen(pkgdirp->d_name) == 9) && !(strncmp(pkgdirp->d_name, "musl", 4) == 0) && !(strncmp(pkgdirp->d_name, "glibc", 5) == 0)) { /* print result to stdout */ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 078f93400..93d934d11 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= app/debug PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} PKG_DEPENDS:= libncurses zlib libexpat libthread-db PKG_BUILDDEP:= ncurses readline expat zlib +PKG_NEEDS:= c++ PKG_NOPARALLEL:= 1 PKG_ARCH_DEPENDS:= !cris !m68k !avr32 !nios2 !microblaze diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile new file mode 100644 index 000000000..0a6613aaa --- /dev/null +++ b/package/uclibc-ng-test/Makefile @@ -0,0 +1,36 @@ +# 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 + +PKG_NAME:= uClibc-ng-test +PKG_VERSION:= git +PKG_RELEASE:= 1 +PKG_DESCR:= embedded c library testsuite +PKG_SECTION:= base/tests +PKG_URL:= http://www.uclibc-ng.org +PKG_SITES:= git://uclibc-ng.org/git/uclibc-ng-test + +PKG_NOPARALLEL:= 1 +PKG_LIBC_DEPENDS:= uclibc-ng + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,UCLIBC_NG_TEST,uclibc-ng-test,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +ifeq ($(ADK_RUNTIME_ENABLE_LOCALE),) +XAKE_FLAGS+= NO_LOCALE=1 +endif + +uclibc-ng-test-install: + ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc + echo '00:11:22:33:44:55 teeth' > ${IDIR_UCLIBC_NG_TEST}/etc/ethers + ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng + ${CP} $(WRKBUILD)/test \ + ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng + @find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -exec rm {} \; + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/uclibc-ng/Config.in.manual b/package/uclibc-ng/Config.in.manual index a8f72eecf..8e9a7a55f 100644 --- a/package/uclibc-ng/Config.in.manual +++ b/package/uclibc-ng/Config.in.manual @@ -6,10 +6,3 @@ config ADK_PACKAGE_UCLIBC_NG help Embedded C library. -config ADK_PACKAGE_UCLIBC_NG_TEST - bool "uClibc-ng-test.......... embedded C library (testsuite)" - depends on ADK_TARGET_LIB_UCLIBC_NG - default n - help - Embedded C library testsuite. - diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 6e5b5abf8..b3ba6f228 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -11,11 +11,9 @@ PKG_DESCR:= embedded c library PKG_SECTION:= base/libs PKG_OPTS:= noremove nostaging noscripts -PKG_SUBPKGS:= UCLIBC_NG UCLIBC_NG_DEV UCLIBC_NG_TEST +PKG_SUBPKGS:= UCLIBC_NG UCLIBC_NG_DEV 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,7 +21,6 @@ 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 @@ -61,12 +58,4 @@ 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}/etc - echo '00:11:22:33:44:55 teeth' > ${IDIR_UCLIBC_NG_TEST}/etc/ethers - ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng - ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/test \ - ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng - @find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -exec rm {} \; - include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index d6028311a..d26ea41e0 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -357,19 +357,6 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ VERBOSE=1 \ install_utils - PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ - ARCH="$(ADK_TARGET_ARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - HOSTCC="$(HOST_CC)" \ - PREFIX=$(STAGING_TARGET_DIR)/uclibc-ng \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=/ \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ - UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - TEST_INSTALLED_UCLIBC=1 \ - UCLIBC_ONLY=1 \ - VERBOSE=1 \ - test_compile test_gen touch $@ include ${ADK_TOPDIR}/mk/toolchain.mk -- cgit v1.2.3