diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-10-11 17:18:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-10-11 17:18:57 +0200 |
| commit | caf7cf1a9ceb76481bea92282e886cce420b07ff (patch) | |
| tree | 452028468d49e94d20b5c7cdffad1065a98f52ce /mk | |
| parent | 0bdeb3a8e7a5bf05dee49a8cf42701a51927ec15 (diff) | |
remove already disabled uClibc support, fix wrong PKG_LIBC_DEPENDS
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 19 | ||||
| -rw-r--r-- | mk/package.mk | 2 |
2 files changed, 1 insertions, 20 deletions
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 |