[ptxdist] [PATCH] proftpd: Use ptx/endis to enable options

[ptxdist] [PATCH] proftpd: Use ptx/endis to enable options

[Ladislav Michl]

From: Ladislav Michl <ladis@linux-mips.org>

Remove some ifdefs and replace deprecated variables while there.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/proftpd.make | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/rules/proftpd.make b/rules/proftpd.make
index 6554dced7..889a9fef8 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -27,39 +27,20 @@ PROFTPD_DIR		:= $(BUILDDIR)/$(PROFTPD)
 # Prepare
 # ----------------------------------------------------------------------------
 
-PROFTPD_COMPILE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
+PROFTPD_MAKE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
 
 #
 # autoconf
 #
-PROFTPD_AUTOCONF	:= \
+PROFTPD_CONF_TOOL	:= autoconf
+PROFTPD_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_IPV6_OPTION) \
-	--disable-cap
-
-ifdef PTXCONF_PROFTPD_PAM
-PROFTPD_AUTOCONF += --enable-auth-pam
-else
-PROFTPD_AUTOCONF += --disable-auth-pam
-endif
-
-ifdef PTXCONF_PROFTPD_SENDFILE
-PROFTPD_AUTOCONF += --enable-sendfile
-else
-PROFTPD_AUTOCONF += --disable-sendfile
-endif
-
-ifdef PTXCONF_PROFTPD_SHADOW
-PROFTPD_AUTOCONF += --enable-shadow
-else
-PROFTPD_AUTOCONF += --disable-shadow
-endif
-
-ifdef PTXCONF_PROFTPD_AUTOSHADOW
-PROFTPD_AUTOCONF += --enable-autoshadow
-else
-PROFTPD_AUTOCONF += --disable-autoshadow
-endif
+	--disable-cap \
+	--$(call ptx/endis, PTXCONF_PROFTPD_PAM)-auth-pam \
+	--$(call ptx/endis, PTXCONF_PROFTPD_SENDFILE)-sendfile \
+	--$(call ptx/endis, PTXCONF_PROFTPD_SHADOW)-shadow \
+	--$(call ptx/endis, PTXCONF_PROFTPD_AUTOSHADOW)-autoshadow
 
 PROFTPD_MAKE_PAR := NO
 
-- 
2.32.0

Re: [ptxdist] [APPLIED] proftpd: Use ptx/endis to enable options

[Michael Olbrich]

Thanks, applied as ccf0340b89cb754cf171fb9f8e88d2dc308b923c.

Michael

[sent from post-receive hook]

On Fri, 28 Oct 2022 16:44:07 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Remove some ifdefs and replace deprecated variables while there.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <Y052K561zUeaCSVq@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/proftpd.make b/rules/proftpd.make
> index 6554dced73b8..889a9fef8e69 100644
> --- a/rules/proftpd.make
> +++ b/rules/proftpd.make
> @@ -27,39 +27,20 @@ PROFTPD_DIR		:= $(BUILDDIR)/$(PROFTPD)
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -PROFTPD_COMPILE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
> +PROFTPD_MAKE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
>  
>  #
>  # autoconf
>  #
> -PROFTPD_AUTOCONF	:= \
> +PROFTPD_CONF_TOOL	:= autoconf
> +PROFTPD_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	$(GLOBAL_IPV6_OPTION) \
> -	--disable-cap
> -
> -ifdef PTXCONF_PROFTPD_PAM
> -PROFTPD_AUTOCONF += --enable-auth-pam
> -else
> -PROFTPD_AUTOCONF += --disable-auth-pam
> -endif
> -
> -ifdef PTXCONF_PROFTPD_SENDFILE
> -PROFTPD_AUTOCONF += --enable-sendfile
> -else
> -PROFTPD_AUTOCONF += --disable-sendfile
> -endif
> -
> -ifdef PTXCONF_PROFTPD_SHADOW
> -PROFTPD_AUTOCONF += --enable-shadow
> -else
> -PROFTPD_AUTOCONF += --disable-shadow
> -endif
> -
> -ifdef PTXCONF_PROFTPD_AUTOSHADOW
> -PROFTPD_AUTOCONF += --enable-autoshadow
> -else
> -PROFTPD_AUTOCONF += --disable-autoshadow
> -endif
> +	--disable-cap \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_PAM)-auth-pam \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_SENDFILE)-sendfile \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_SHADOW)-shadow \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_AUTOSHADOW)-autoshadow
>  
>  PROFTPD_MAKE_PAR := NO
>