From: Ladislav Michl <oss-lists@triops.cz>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] proftpd: Use ptx/endis to enable options
Date: Tue, 18 Oct 2022 11:47:23 +0200 [thread overview]
Message-ID: <Y052K561zUeaCSVq@lenoch> (raw)
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
next reply other threads:[~2022-10-18 9:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 9:47 Ladislav Michl [this message]
2022-10-28 14:44 ` [ptxdist] [APPLIED] " Michael Olbrich
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=Y052K561zUeaCSVq@lenoch \
--to=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