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

4 files changed, 12 insertions, 9 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 7f1d49838..ae0806669 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -234,7 +234,7 @@ cleandir:
 	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
 	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
 	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
-	rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+	rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR)
 	rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
 
 cleantarget:
@@ -248,9 +248,9 @@ distclean:
 	@$(TRACE) distclean
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
 	@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
 	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
-	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
 	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
 	    .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
 
@@ -477,9 +477,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
 	@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
 	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
-	@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+	@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
 	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
 	    .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
 
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 2cb4f1714..3c79fc1e8 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -47,7 +47,11 @@ ${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE}
 ifeq (${_CHECKSUM_COOKIE},)
 	rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
 endif
+ifeq ($(EXTRACT_OVERRIDE),1)
+	${MAKE} do-extract
+else	
 	${EXTRACT_CMD}
+endif
 	@${MAKE} post-extract $(MAKE_TRACE)
 	touch $@
 
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index ff7bd5638..49bae85f8 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -72,10 +72,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),)
 	    done;
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	    env ${CONFIGURE_ENV} \
-	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
-	    --build=${GNU_HOST_NAME} \
-	    --host=${GNU_TARGET_NAME} \
-	    --target=${GNU_TARGET_NAME} \
+	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} ${CONFIGURE_TRIPLE} \
 	    --program-prefix= \
 	    --program-suffix= \
 	    --prefix=/usr \
diff --git a/mk/vars.mk b/mk/vars.mk
index ee5faec10..7d15e1bc3 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -50,9 +50,11 @@ GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux
 ifeq ($(ADK_NATIVE),y) 
 TARGET_CROSS:=
 TARGET_COMPILER_PREFIX?=
+CONFIGURE_TRIPLE:=	
 else
 TARGET_CROSS:=		$(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)-
 TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
+CONFIGURE_TRIPLE:=	--build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
 endif
 
 ifneq ($(strip ${ADK_USE_CCACHE}),)