From 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 23 Jan 2014 08:12:50 +0100
Subject: remove jtools/java host dir. use host stuff instead. fix arm
 building.

---
 mk/vars.mk | 2 --
 1 file changed, 2 deletions(-)

(limited to 'mk/vars.mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index 657d44ae5..fcd22a5e6 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,7 +18,6 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
-STAGING_JAVA_HOST_DIR:=	${BASE_DIR}/jhost
 # use headers and foo-config from system
 ifeq ($(ADK_NATIVE),y)
 STAGING_TARGET_DIR:=
@@ -35,7 +34,6 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LI
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
-JTOOLS_BUILD_DIR=	$(BASE_DIR)/jtools_build
 TOOLS_DIR:=		$(BASE_DIR)/bin/tools
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 BIN_DIR:=		$(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
-- 
cgit v1.2.3


From 53d5800eb6fb9431f61c2e0941efcd1a20ce2b4a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 24 Jan 2014 12:13:26 +0100
Subject: higher timeout for slow proxies

---
 mk/vars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk/vars.mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index e217a9dca..617316e29 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -218,7 +218,7 @@ QUIET:=
 else
 QUIET:=			--quiet
 endif
-FETCH_CMD?=		wget --timeout=5 -t 3 $(QUIET)
+FETCH_CMD?=		wget --timeout=10 -t 3 $(QUIET)
 
 ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
-- 
cgit v1.2.3


From 54419b88b5b9590e26dbf50b2985f9d0cca2fbb2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 25 Jan 2014 20:58:58 +0100
Subject: fix clang warning

---
 mk/vars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk/vars.mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index 617316e29..23cc018f0 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -118,7 +118,7 @@ endif
 
 # A nifty macro to make testing gcc features easier (from uClibc project)
 check_gcc=$(shell \
-        if $(CC_FOR_BUILD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+        if $(CC_FOR_BUILD) $(1) -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
         then echo "$(1)"; else echo "$(2)"; fi)
 
 CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,)
-- 
cgit v1.2.3