From 7377adf328ebaa19646868e77ac095ae6febe250 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Thu, 30 Jun 2022 23:28:30 +0200
Subject: [PATCH] - dropbear: update build

---
 package/dropbear/dropbear.mk | 28 ++++++++++++++--------------
 package/pkg-python.mk        |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 6caa869c..e7a2f989 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -21,8 +21,21 @@ DROPBEAR_CONF_OPTS = \
 	--enable-bundled-libtom
 
 DROPBEAR_MAKE_OPTS = \
+	SCPPROGRESS=1 \
 	PROGRAMS="dropbear dbclient dropbearkey scp"
 
+define DROPBEAR_CONFIGURE_LOCALOPTIONS
+	# Ensure that dropbear doesn't use crypt() when it's not available
+	echo '#if !HAVE_CRYPT'				>> $(PKG_BUILD_DIR)/localoptions.h
+	echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0'	>> $(PKG_BUILD_DIR)/localoptions.h
+	echo '#endif'					>> $(PKG_BUILD_DIR)/localoptions.h
+	# disable SMALL_CODE define
+	echo '#define DROPBEAR_SMALL_CODE 0'		>> $(PKG_BUILD_DIR)/localoptions.h
+	# fix PATH define
+	echo '#define DEFAULT_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/var/bin"' >> $(PKG_BUILD_DIR)/localoptions.h
+endef
+DROPBEAR_POST_CONFIGURE_HOOKS = DROPBEAR_CONFIGURE_LOCALOPTIONS
+
 define DROPBEAR_INSTALL_INIT_SCRIPT
 	$(INSTALL) -d $(TARGET_sysconfdir)/dropbear
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/dropbear.init $(TARGET_sysconfdir)/init.d/dropbear
@@ -31,17 +44,4 @@ endef
 DROPBEAR_TARGET_FINALIZE_HOOKS += DROPBEAR_INSTALL_INIT_SCRIPT
 
 dropbear: | $(TARGET_DIR)
-	$(call PREPARE)
-	$(call TARGET_CONFIGURE)
-	$(CHDIR)/$($(PKG)_DIR); \
-		# Ensure that dropbear doesn't use crypt() when it's not available; \
-		echo '#if !HAVE_CRYPT'				>> localoptions.h; \
-		echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0'	>> localoptions.h; \
-		echo '#endif'					>> localoptions.h; \
-		# disable SMALL_CODE define; \
-		echo '#define DROPBEAR_SMALL_CODE 0'		>> localoptions.h; \
-		# fix PATH define; \
-		echo '#define DEFAULT_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/var/bin"' >> localoptions.h; \
-		$(MAKE) $($(PKG)_MAKE_OPTS) SCPPROGRESS=1; \
-		$(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)
-	$(call TARGET_FOLLOWUP)
+	$(call autotools-package)
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
index f285a49f..f35b9911 100644
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -31,7 +31,7 @@ endef
 # -----------------------------------------------------------------------------
 
 define host-python3-package
-	$(call PREPARE)
+	$(call PREPARE,$(1))
 	$(call HOST_PYTHON3_BUILD)
 	$(call HOST_PYTHON3_INSTALL)
 	$(call HOST_FOLLOWUP)