From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Ladislav Michl <oss-lists@triops.cz>
Subject: Re: [ptxdist] [APPLIED] proftpd: Use ptx/endis to enable options
Date: Fri, 28 Oct 2022 16:44:07 +0200 [thread overview]
Message-ID: <20221028144407.2244650-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <Y052K561zUeaCSVq@lenoch>
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
>
prev parent reply other threads:[~2022-10-28 14:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 9:47 [ptxdist] [PATCH] " Ladislav Michl
2022-10-28 14:44 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221028144407.2244650-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=oss-lists@triops.cz \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox