From 13987e7baab1da72f4187ef90229a8ab45f58e01 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Jul 2014 13:20:32 +0200 Subject: add support for uClibc-ng in parallel to uClibc. This helps to find any regressions made in uClibc-ng. --- mk/build.mk | 5 +++-- mk/package.mk | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 29d5023d4..78e371fbc 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -358,7 +358,7 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/.defconfig; \ fi - if [ ! -z "$(ADK_TARGET_ENDIAN)" ];then \ + @if [ ! -z "$(ADK_TARGET_ENDIAN)" ];then \ grep "^config" target/config/Config.in.endian.choice \ |grep -i "$(ADK_TARGET_ENDIAN)" \ |sed -e "s#^config \(.*\)#\1=y#" \ @@ -371,8 +371,9 @@ endif >> $(ADK_TOPDIR)/.defconfig; \ fi @if [ ! -z "$(ADK_TARGET_LIBC)" ];then \ + libc=$(echo $(ADK_TARGET_LIBC)|sed -e "#-#_#") \ grep "^config" target/config/Config.in.libc.choice \ - |grep -i "$(ADK_TARGET_LIBC)" \ + |grep -i $libc \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/.defconfig; \ fi diff --git a/mk/package.mk b/mk/package.mk index d2952a859..8e30369cc 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -287,6 +287,7 @@ $$(INFO_$(1)): $$(IPKG_$(1)) $$(INFO_$(1)_DBG): $$(IPKG_$(1)_DBG) $(PKG_INSTALL) $$(IPKG_$(1)_DBG) +ifneq ($(1),UCLIBC_NG) ifneq ($(1),UCLIBC) ifneq ($(1),GLIBC) ifneq ($(1),MUSL) @@ -295,6 +296,7 @@ $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV) endif endif endif +endif endef -- cgit v1.2.3