From bcd130f15376964f63bd9f88c24d30ae3cb14432 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 19 Mar 2014 20:54:03 +0100
Subject: use separate WRKDIR for host packages to avoid rebuild problems in
 wrong order, findstring idea from tg

---
 mk/host.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'mk/host.mk')

diff --git a/mk/host.mk b/mk/host.mk
index aa88bab44..ce41a7d7d 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -1,6 +1,11 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+# This is where all package operation is done in
+ifneq (,$(findstring hostpackage,$(MAKECMDGOALS)))
+WRKDIR?=		${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
+endif
+
 HOST_CONFIGURE_ENV+=	AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
 			CONFIG_SHELL='$(strip ${SHELL})' \
 			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \
@@ -30,7 +35,7 @@ HOST_MAKE_ENV+=		PATH='${HOST_PATH}' \
 HOST_MAKE_FLAGS+=	${HOST_XAKE_FLAGS} V=1
 HOST_FAKE_FLAGS+=	${HOST_XAKE_FLAGS}
 
-HOST_WRKINST=		${WRKDIR}/host
+HOST_WRKINST=		${WRKDIR}/fake
 
 _HOST_EXTRACT_COOKIE=	${WRKDIST}/.extract_done
 _HOST_PATCH_COOKIE=	${WRKDIST}/.prepared
@@ -54,7 +59,7 @@ hostfake: ${_HOST_FAKE_COOKIE}
 define HOST_template
 ALL_PKGOPTS+=	$(1)
 PKGNAME_$(1)=	$(2)
-HOSTDIR_$(1)=	$(WRKDIR)/host
+HOSTDIR_$(1)=	$(WRKDIR)/fake
 ALL_HOSTDIRS+=	$${HOSTDIR_$(1)}
 ALL_HOSTINST+=	$(2)-hostinstall
 
-- 
cgit v1.2.3


From 8d6de9990ea0098f0932f4bfe64c331b67a9a40e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 00:16:45 +0100
Subject: convert to HOST_STYLE auto, add hostclean target

---
 mk/host.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk/host.mk')

diff --git a/mk/host.mk b/mk/host.mk
index ce41a7d7d..5f9539aef 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 # This is where all package operation is done in
-ifneq (,$(findstring hostpackage,$(MAKECMDGOALS)))
+ifneq (,$(findstring host,$(MAKECMDGOALS)))
 WRKDIR?=		${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
 endif
 
@@ -68,4 +68,4 @@ $$(HOSTDIR_$(1)): ${_HOST_PATCH_COOKIE} ${_HOST_FAKE_COOKIE}
 endef
 
 .PHONY:	all hostextract hostpatch hostconfigure \
-	hostbuild hostpackage hostfake
+	hostbuild hostpackage hostfake hostclean
-- 
cgit v1.2.3


From 8aed1fcd443b550c15a21ddbf1b1d3899803120a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 30 Mar 2014 15:55:20 +0200
Subject: rework hosttools building, add tools into package stuff

---
 mk/host.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mk/host.mk')

diff --git a/mk/host.mk b/mk/host.mk
index 5f9539aef..8d3e7d74e 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -10,6 +10,7 @@ HOST_CONFIGURE_ENV+=	AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
 			CONFIG_SHELL='$(strip ${SHELL})' \
 			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \
 			PATH='${HOST_PATH}' \
+			CC='$(strip ${CC_FOR_BUILD})' \
 			CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \
 			CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \
 			CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \
@@ -28,6 +29,7 @@ HOST_INSTALL_TARGET?=	install
 
 HOST_MAKE_ENV+=		PATH='${HOST_PATH}' \
 			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \
+			CC='$(strip ${CC_FOR_BUILD})' \
 			CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \
 			CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \
 			CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \
-- 
cgit v1.2.3


From e81e05c453686b0aed5799fa52e398a07f43a4f9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 31 Mar 2014 08:12:09 +0200
Subject: use HOST_BUILD_DIR to avoid rebuilding after make clean, add
 genext2fs to checks

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

(limited to 'mk/host.mk')

diff --git a/mk/host.mk b/mk/host.mk
index 8d3e7d74e..88f8d2e01 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -3,7 +3,7 @@
 
 # This is where all package operation is done in
 ifneq (,$(findstring host,$(MAKECMDGOALS)))
-WRKDIR?=		${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
+WRKDIR?=		${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
 endif
 
 HOST_CONFIGURE_ENV+=	AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
-- 
cgit v1.2.3