From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: <ptxdist-bounces@pengutronix.de> Received: from eddie.linux-mips.org ([148.251.95.138] helo=cvs.linux-mips.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from <ladis@linux-mips.org>) id 1jDvDR-0007Gu-0o for ptxdist@pengutronix.de; Mon, 16 Mar 2020 20:15:57 +0100 Received: (from localhost user: 'ladis' uid#1021 fake: STDIN (ladis@eddie.linux-mips.org)) by eddie.linux-mips.org id S23993114AbgCPTP4pI-ZB (ORCPT <rfc822;ptxdist@pengutronix.de>); Mon, 16 Mar 2020 20:15:56 +0100 Date: Mon, 16 Mar 2020 20:15:55 +0100 From: Ladislav Michl <ladis@linux-mips.org> Message-ID: <20200316191555.GC16217@lenoch> References: <20200316191435.GA16217@lenoch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200316191435.GA16217@lenoch> Subject: [ptxdist] [PATCH 2/4] dnsmasq: use ptx/ifdef List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de> List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe> List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/> List-Post: <mailto:ptxdist@pengutronix.de> List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help> List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, <mailto:ptxdist-request@pengutronix.de?subject=subscribe> Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" <ptxdist-bounces@pengutronix.de> To: ptxdist@pengutronix.de 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