{"id":806944,"url":"http://patchwork.ozlabs.org/api/1.2/patches/806944/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/63b4508028ac952e2bb27b1708975fc6c938e0a8.1503982992.git.baruch@tkos.co.il/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.2/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<63b4508028ac952e2bb27b1708975fc6c938e0a8.1503982992.git.baruch@tkos.co.il>","list_archive_url":null,"date":"2017-08-29T05:03:12","name":"[next,2/2] dnsmasq: simplify build configuration","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1a3ed05a2814b86cc560b5070727e234660dc896","submitter":{"id":1458,"url":"http://patchwork.ozlabs.org/api/1.2/people/1458/?format=json","name":"Baruch Siach","email":"baruch@tkos.co.il"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/63b4508028ac952e2bb27b1708975fc6c938e0a8.1503982992.git.baruch@tkos.co.il/mbox/","series":[{"id":305,"url":"http://patchwork.ozlabs.org/api/1.2/series/305/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=305","date":"2017-08-29T05:03:12","name":"[next,1/2] dnsmasq: bump to version 2.77","version":1,"mbox":"http://patchwork.ozlabs.org/series/305/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/806944/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806944/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","Received":["from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhGkG4ks9z9t1G\n\tfor ;\n\tTue, 29 Aug 2017 15:03:34 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 87FD18942A;\n\tTue, 29 Aug 2017 05:03:27 +0000 (UTC)","from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id eIs5kqYC8Sna; Tue, 29 Aug 2017 05:03:25 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A1FD9893D8;\n\tTue, 29 Aug 2017 05:03:25 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id C7CD31C1E9A\n\tfor ;\n\tTue, 29 Aug 2017 05:03:24 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C295985C3F\n\tfor ;\n\tTue, 29 Aug 2017 05:03:24 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id gDLAU2Qongzb for ;\n\tTue, 29 Aug 2017 05:03:22 +0000 (UTC)","from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id A656682DDB\n\tfor ; Tue, 29 Aug 2017 05:03:22 +0000 (UTC)","from tarshish.tkos.co.il (unknown [10.0.8.6])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby mx.tkos.co.il (Postfix) with ESMTPSA id BE4794407B2;\n\tTue, 29 Aug 2017 08:03:19 +0300 (IDT)"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","From":"Baruch Siach ","To":"buildroot@busybox.net","Date":"Tue, 29 Aug 2017 08:03:12 +0300","Message-Id":"<63b4508028ac952e2bb27b1708975fc6c938e0a8.1503982992.git.baruch@tkos.co.il>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<1026a6ca932ca0b0fca113a766ecd2d5d3ad89c7.1503982992.git.baruch@tkos.co.il>","References":"<1026a6ca932ca0b0fca113a766ecd2d5d3ad89c7.1503982992.git.baruch@tkos.co.il>","Subject":"[Buildroot] [PATCH next 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"Drop direct sed'ing of config.h for HAVE_CONNTRACK, HAVE_LUASCRIPT, and\nHAVE_DBUS. Use MAKE_OPTS COPTS parameters instead, like we do already\nfor all other options.\n\nRename DNSMASQ_ENABLE_LUA to DNSMASQ_TWEAK_LIBLUA since it now does only\nthat.\n\nMerge two conntrack and three dbus conditional sections.\n\nSigned-off-by: Baruch Siach \n---\n package/dnsmasq/dnsmasq.mk | 42 ++++++++++--------------------------------\n 1 file changed, 10 insertions(+), 32 deletions(-)","diff":"diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk\nindex ffbbeb8f8768..925cd7b6dabd 100644\n--- a/package/dnsmasq/dnsmasq.mk\n+++ b/package/dnsmasq/dnsmasq.mk\n@@ -40,32 +40,31 @@ endif\n \n ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)\n DNSMASQ_DEPENDENCIES += libnetfilter_conntrack\n-endif\n-\n-ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)\n-define DNSMASQ_ENABLE_CONNTRACK\n-\t$(SED) 's^.*#define HAVE_CONNTRACK.*^#define HAVE_CONNTRACK^' \\\n-\t\t$(DNSMASQ_DIR)/src/config.h\n-endef\n+DNSMASQ_COPTS += -DHAVE_CONNTRACK\n endif\n \n ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)\n DNSMASQ_DEPENDENCIES += lua\n+DNSMASQ_COPTS += -DHAVE_LUASCRIPT\n \n # liblua uses dlopen when dynamically linked\n ifneq ($(BR2_STATIC_LIBS),y)\n DNSMASQ_MAKE_OPTS += LIBS+=\"-ldl\"\n endif\n \n-define DNSMASQ_ENABLE_LUA\n+define DNSMASQ_TWEAK_LIBLUA\n \t$(SED) 's/lua5.2/lua/g' $(DNSMASQ_DIR)/Makefile\n-\t$(SED) 's^.*#define HAVE_LUASCRIPT.*^#define HAVE_LUASCRIPT^' \\\n-\t\t$(DNSMASQ_DIR)/src/config.h\n endef\n endif\n \n ifeq ($(BR2_PACKAGE_DBUS),y)\n DNSMASQ_DEPENDENCIES += dbus\n+DNSMASQ_COPTS += -DHAVE_DBUS\n+\n+define DNSMASQ_INSTALL_DBUS\n+\t$(INSTALL) -m 0644 -D $(@D)/dbus/dnsmasq.conf \\\n+\t\t$(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf\n+endef\n endif\n \n define DNSMASQ_FIX_PKGCONFIG\n@@ -73,33 +72,12 @@ define DNSMASQ_FIX_PKGCONFIG\n \t\t$(DNSMASQ_DIR)/Makefile\n endef\n \n-ifeq ($(BR2_PACKAGE_DBUS),y)\n-define DNSMASQ_ENABLE_DBUS\n-\t$(SED) 's^.*#define HAVE_DBUS.*^#define HAVE_DBUS^' \\\n-\t\t$(DNSMASQ_DIR)/src/config.h\n-endef\n-else\n-define DNSMASQ_ENABLE_DBUS\n-\t$(SED) 's^.*#define HAVE_DBUS.*^/* #define HAVE_DBUS */^' \\\n-\t\t$(DNSMASQ_DIR)/src/config.h\n-endef\n-endif\n-\n define DNSMASQ_BUILD_CMDS\n \t$(DNSMASQ_FIX_PKGCONFIG)\n-\t$(DNSMASQ_ENABLE_DBUS)\n-\t$(DNSMASQ_ENABLE_LUA)\n-\t$(DNSMASQ_ENABLE_CONNTRACK)\n+\t$(DNSMASQ_TWEAK_LIBLUA)\n \t$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)\n endef\n \n-ifeq ($(BR2_PACKAGE_DBUS),y)\n-define DNSMASQ_INSTALL_DBUS\n-\t$(INSTALL) -m 0644 -D $(@D)/dbus/dnsmasq.conf \\\n-\t\t$(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf\n-endef\n-endif\n-\n define DNSMASQ_INSTALL_TARGET_CMDS\n \t$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N)\n \tmkdir -p $(TARGET_DIR)/var/lib/misc/\n","prefixes":["next","2/2"]}