From 1f7f48bf62d903ab191863b387b77020ca4a5c73 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 28 Mar 2021 14:16:09 +0200
Subject: [PATCH] - move more host-autotools-packages to package dir

---
 make/host-tools.mk       | 44 ----------------------------------------
 package/expat/expat.mk   | 13 ++++++++++++
 package/libffi/libffi.mk | 10 +++++++++
 3 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/make/host-tools.mk b/make/host-tools.mk
index 5f6b078b..a2f12bbf 100644
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@@ -171,29 +171,6 @@ host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_EXPAT_VERSION = $(EXPAT_VERSION)
-HOST_EXPAT_DIR = expat-$(EXPAT_VERSION)
-HOST_EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
-HOST_EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VERSION)
-
-#$(DL_DIR)/$(HOST_EXPAT_SOURCE):
-#	$(download) $(HOST_EXPAT_SITE)/$(EXPAT_SOURCE)
-
-HOST_EXPAT_CONF_OPTS = \
-	--without-docbook
-
-host-expat: $(DL_DIR)/$(HOST_EXPAT_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_EXPAT_DIR)
-	$(UNTAR)/$(HOST_EXPAT_SOURCE)
-	$(CHDIR)/$(HOST_EXPAT_DIR); \
-		$(HOST_CONFIGURE);\
-		$(MAKE); \
-		$(MAKE) install
-	$(REMOVE)/$(HOST_EXPAT_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 HOST_PYTHON3_VERSION = 3.9.0
 HOST_PYTHON3_DIR = Python-$(HOST_PYTHON3_VERSION)
 HOST_PYTHON3_SOURCE = Python-$(HOST_PYTHON3_VERSION).tar.xz
@@ -260,27 +237,6 @@ host-python3-setuptools: $(HOST_PYTHON3_SETUPTOOLS_DEPENDENCIES) $(DL_DIR)/$(HOS
 
 # -----------------------------------------------------------------------------
 
-HOST_LIBFFI_VERSION = $(LIBFFI_VERSION)
-HOST_LIBFFI_DIR = libffi-$(HOST_LIBFFI_VERSION)
-HOST_LIBFFI_SOURCE = libffi-$(HOST_LIBFFI_VERSION).tar.gz
-HOST_LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VERSION)
-
-#$(DL_DIR)/$(HOST_LIBFFI_SOURCE):
-#	$(download) $(HOST_LIBFFI_SITE)/$(HOST_LIBFFI_SOURCE)
-
-host-libffi: $(DL_DIR)/$(HOST_LIBFFI_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
-	$(CHDIR)/$(PKG_DIR); \
-		$(HOST_CONFIGURE);\
-		$(MAKE); \
-		$(MAKE) install
-	$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 HOST_LUA_VERSION = $(LUA_VERSION)
 HOST_LUA_DIR = lua-$(HOST_LUA_VERSION)
 HOST_LUA_SOURCE = lua-$(HOST_LUA_VERSION).tar.gz
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index b2e18c32..03d2b1c4 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -18,3 +18,16 @@ EXPAT_CONF_OPTS = \
 
 expat: | $(TARGET_DIR)
 	$(call autotools-package)
+
+# -----------------------------------------------------------------------------
+
+HOST_EXPAT_VERSION = $(EXPAT_VERSION)
+HOST_EXPAT_DIR = $(EXPAT_DIR)
+HOST_EXPAT_SOURCE = $(EXPAT_SOURCE)
+HOST_EXPAT_SITE = $(EXPAT_SITE)
+
+HOST_EXPAT_CONF_OPTS = \
+	--without-docbook
+
+host-expat: | $(HOST_DIR)
+	$(call host-autotools-package)
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 141c8296..b960d0c0 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -17,3 +17,13 @@ LIBFFI_CONF_OPTS = \
 
 libffi: | $(TARGET_DIR)
 	$(call autotools-package)
+
+# -----------------------------------------------------------------------------
+
+HOST_LIBFFI_VERSION = $(LIBFFI_VERSION)
+HOST_LIBFFI_DIR = $(LIBFFI_DIR)
+HOST_LIBFFI_SOURCE = $(LIBFFI_SOURCE)
+HOST_LIBFFI_SITE = $(LIBFFI_SITE)
+
+host-libffi: | $(HOST_DIR)
+	$(call host-autotools-package)