Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 9 years ago
parent
commit
5bd0b0dfdf
3 changed files with 3 additions and 1 deletions
  1. 1 1
      mk/build.mk
  2. 1 0
      package/bzip2/Makefile
  3. 1 0
      target/config/Config.in.cpu

+ 1 - 1
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

+ 1 - 0
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

+ 1 - 0
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