From patchwork Mon Oct 2 17:38:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 820633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y5Tsw3xvjz9t5R for ; Tue, 3 Oct 2017 04:38:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B82F682D84; Mon, 2 Oct 2017 17:38:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xzdlmqMglFDO; Mon, 2 Oct 2017 17:38:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A264F8828A; Mon, 2 Oct 2017 17:38:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4D5661BFEBB for ; Mon, 2 Oct 2017 17:38:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 492ED874C1 for ; Mon, 2 Oct 2017 17:38:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TEfE-6ycOZIt for ; Mon, 2 Oct 2017 17:38:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4037B86DDB for ; Mon, 2 Oct 2017 17:38:37 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 3800344052E; Mon, 2 Oct 2017 20:38:16 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Mon, 2 Oct 2017 20:38:26 +0300 Message-Id: X-Mailer: git-send-email 2.14.2 In-Reply-To: <9b9ffd72d158a792696b98b6612e4e66ee11892a.1506965906.git.baruch@tkos.co.il> References: <9b9ffd72d158a792696b98b6612e4e66ee11892a.1506965906.git.baruch@tkos.co.il> Subject: [Buildroot] [PATCH v2 2/2] dnsmasq: simplify build configuration X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop direct sed'ing of config.h for HAVE_CONNTRACK, HAVE_LUASCRIPT, and HAVE_DBUS. Use MAKE_OPTS COPTS parameters instead, like we do already for all other options. Rename DNSMASQ_ENABLE_LUA to DNSMASQ_TWEAK_LIBLUA since it now does only that. Merge two conntrack and three dbus conditional sections. Signed-off-by: Baruch Siach --- v2: No change --- package/dnsmasq/dnsmasq.mk | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 7322170432a0..9f96030eb624 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -40,32 +40,31 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) DNSMASQ_DEPENDENCIES += libnetfilter_conntrack -endif - -ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) -define DNSMASQ_ENABLE_CONNTRACK - $(SED) 's^.*#define HAVE_CONNTRACK.*^#define HAVE_CONNTRACK^' \ - $(DNSMASQ_DIR)/src/config.h -endef +DNSMASQ_COPTS += -DHAVE_CONNTRACK endif ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y) DNSMASQ_DEPENDENCIES += lua +DNSMASQ_COPTS += -DHAVE_LUASCRIPT # liblua uses dlopen when dynamically linked ifneq ($(BR2_STATIC_LIBS),y) DNSMASQ_MAKE_OPTS += LIBS+="-ldl" endif -define DNSMASQ_ENABLE_LUA +define DNSMASQ_TWEAK_LIBLUA $(SED) 's/lua5.2/lua/g' $(DNSMASQ_DIR)/Makefile - $(SED) 's^.*#define HAVE_LUASCRIPT.*^#define HAVE_LUASCRIPT^' \ - $(DNSMASQ_DIR)/src/config.h endef endif ifeq ($(BR2_PACKAGE_DBUS),y) DNSMASQ_DEPENDENCIES += dbus +DNSMASQ_COPTS += -DHAVE_DBUS + +define DNSMASQ_INSTALL_DBUS + $(INSTALL) -m 0644 -D $(@D)/dbus/dnsmasq.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf +endef endif define DNSMASQ_FIX_PKGCONFIG @@ -73,33 +72,12 @@ define DNSMASQ_FIX_PKGCONFIG $(DNSMASQ_DIR)/Makefile endef -ifeq ($(BR2_PACKAGE_DBUS),y) -define DNSMASQ_ENABLE_DBUS - $(SED) 's^.*#define HAVE_DBUS.*^#define HAVE_DBUS^' \ - $(DNSMASQ_DIR)/src/config.h -endef -else -define DNSMASQ_ENABLE_DBUS - $(SED) 's^.*#define HAVE_DBUS.*^/* #define HAVE_DBUS */^' \ - $(DNSMASQ_DIR)/src/config.h -endef -endif - define DNSMASQ_BUILD_CMDS $(DNSMASQ_FIX_PKGCONFIG) - $(DNSMASQ_ENABLE_DBUS) - $(DNSMASQ_ENABLE_LUA) - $(DNSMASQ_ENABLE_CONNTRACK) + $(DNSMASQ_TWEAK_LIBLUA) $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N) endef -ifeq ($(BR2_PACKAGE_DBUS),y) -define DNSMASQ_INSTALL_DBUS - $(INSTALL) -m 0644 -D $(@D)/dbus/dnsmasq.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf -endef -endif - define DNSMASQ_INSTALL_TARGET_CMDS $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N) mkdir -p $(TARGET_DIR)/var/lib/misc/