From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 29 Mar 2014 17:10:52 +0000 (+0000)
Subject: dropbear: move options.h editing to Build/Configure
X-Git-Tag: reboot~7607
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3ecffab05061b49c74768fe6c1d695ea84fcf863;p=openwrt%2Fstaging%2Fchunkeey.git

dropbear: move options.h editing to Build/Configure

fixes incremental build with change to CONFIG_DROPBEAR_ECC
drop --with-shared which is unknown to configure

Patch by Catalin Patulea <cat@vv.carleton.ca>

SVN-Revision: 40300
---

diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index 692199e8aa..b2bd8cc605 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -59,7 +59,6 @@ define Package/dropbearconvert
 endef
 
 CONFIGURE_ARGS += \
-	--with-shared \
 	--disable-pam \
 	--enable-openpty \
 	--enable-syslog \
@@ -78,8 +77,9 @@ CONFIGURE_ARGS += \
 TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections
 TARGET_LDFLAGS += -Wl,--gc-sections
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
+define Build/Configure
+	$(Build/Configure/Default)
+
 	# Enforce that all replacements are made, otherwise options.h has changed
 	# format and this logic is broken.
 	for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH DROPBEAR_CURVE25519; do \