diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-04 19:00:37 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-04 19:00:37 +0200 |
| commit | 5bd0b0dfdfb53bb51414918f33362e6d14fb2030 (patch) | |
| tree | d569d67e581030ac6ed7c339e55daf69ce992354 | |
| parent | 382f5f3f42c616bda2a35fd6a37554f99b74fb15 (diff) | |
| parent | f5709af4b77b431c023ef8fc67710870ec6eb510 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | package/bzip2/Makefile | 1 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 8bec78bb9..013a61ce3 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -434,7 +434,7 @@ endif fi @if [ ! -z "$(ADK_TARGET_FLOAT)" ];then \ grep "^config" target/config/Config.in.float.choice \ - |grep -i "$(ADK_TARGET_FLOAT)" \ + |grep -i "$(ADK_TARGET_FLOAT)$$" \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/.defconfig; \ fi diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index 15cf56beb..7ad9e9f97 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= compression utility PKG_SECTION:= app/archive PKG_BUILDDEP:= bzip2-host PKG_DEPENDS:= libbz2 +HOST_BUILDDEP:= patch-host PKG_URL:= http://www.bzip.org/ PKG_SITES:= http://www.bzip.org/${PKG_VERSION}/ PKG_LIBNAME:= libbz2 diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 049385501..522f0e3ed 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -419,6 +419,7 @@ config ADK_TARGET_CPU_FLAGS config ADK_TARGET_CPU_TYPE string + depends on ADK_TARGET_TOOLCHAIN default "arc700" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC700 default "archs" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC_HS default "bf512" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF512 |