From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/4] dnsmasq: use ptx/ifdef
Date: Mon, 16 Mar 2020 20:15:55 +0100 [thread overview]
Message-ID: <20200316191555.GC16217@lenoch> (raw)
In-Reply-To: <20200316191435.GA16217@lenoch>
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/dnsmasq.make | 50 +++++++++++++++-------------------------------
1 file changed, 16 insertions(+), 34 deletions(-)
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index bce8dd651..256b0f000 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -33,40 +33,22 @@ DNSMASQ_LICENSE_FILES := \
# Prepare
# ----------------------------------------------------------------------------
-DNSMASQ_PATH := PATH=$(CROSS_PATH)
-DNSMASQ_MAKE_ENV := $(CROSS_ENV)
-
-DNSMASQ_COPT :=
-
-ifndef PTXCONF_DNSMASQ_TFTP
-DNSMASQ_COPT += -DNO_TFTP
-endif
-
-ifndef PTXCONF_GLOBAL_IPV6
-DNSMASQ_COPT += -DNO_IPV6
-endif
-
-ifndef PTXCONF_DNSMASQ_DHCP
-DNSMASQ_COPT += -DNO_DHCP
-else
-ifndef PTXCONF_DNSMASQ_SCRIPT
-DNSMASQ_COPT += -DNO_SCRIPT
-else
-ifdef PTXCONF_DNSMASQ_SCRIPT_LUA
-DNSMASQ_COPT += -DHAVE_LUASCRIPT
-endif
-endif
-endif
-
-ifdef DNSMASQ_DNSSEC
-DNSMASQ_COPT += -DHAVE_DNSSEC
-endif
-
-DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)' "CFLAGS+=-Wall -Wextra -ggdb3 -O2"
-
-$(STATEDIR)/dnsmasq.prepare:
- @$(call targetinfo)
- @$(call touch)
+DNSMASQ_CONF_TOOL := NO
+
+DNSMASQ_COPT :=
+DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_TFTP,,-DNO_TFTP)
+DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_GLOBAL_IPV6,,-DNO_IPV6)
+DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_DNSSEC,-DHAVE_DNSSEC,)
+DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_SCRIPT,,-DNO_SCRIPT)
+DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_SCRIPT_LUA,-DHAVE_LUASCRIPT,)
+DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_DHCP,,-DNO_DHCP)
+
+DNSMASQ_MAKE_OPT := \
+ $(CROSS_ENV_CC) \
+ PREFIX=/usr \
+ AWK=awk \
+ COPTS='$(DNSMASQ_COPT)' \
+ "CFLAGS+=-Wall -Wextra -ggdb3 -O2"
# ----------------------------------------------------------------------------
# Target-Install
--
2.25.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2020-03-16 19:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 19:14 [ptxdist] [PATCH 0/4] dnsmasq fixes Ladislav Michl
2020-03-16 19:15 ` [ptxdist] [PATCH 1/4] dnsmasq: fix nettle dependency Ladislav Michl
2020-03-27 9:52 ` [ptxdist] [1/4] " Michael Olbrich
2020-03-16 19:15 ` Ladislav Michl [this message]
2020-03-27 9:52 ` [ptxdist] [2/4] dnsmasq: use ptx/ifdef Michael Olbrich
2020-03-16 19:16 ` [ptxdist] [PATCH 3/4] dnsmasq: install dnsmasq.conf from package source Ladislav Michl
2020-03-27 9:52 ` [ptxdist] [3/4] " Michael Olbrich
2020-03-16 19:16 ` [ptxdist] [PATCH 4/4] dnsmasq: optionally enable DBus support Ladislav Michl
2020-03-27 9:52 ` [ptxdist] [4/4] " 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=20200316191555.GC16217@lenoch \
--to=ladis@linux-mips.org \
--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