From patchwork Mon Dec 10 10:51:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 204850 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 2EA0B2C0134 for ; Mon, 10 Dec 2012 21:51:36 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 32214A0112; Mon, 10 Dec 2012 10:51:34 +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 qXtInIr55-iH; Mon, 10 Dec 2012 10:51:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 309E5A00A1; Mon, 10 Dec 2012 10:51:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 68EC18F74B for ; Mon, 10 Dec 2012 10:51:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E230882759 for ; Mon, 10 Dec 2012 10:51:30 +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 gaJRUXVVZ8OQ for ; Mon, 10 Dec 2012 10:51:29 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 20586826D0 for ; Mon, 10 Dec 2012 10:51:28 +0000 (UTC) Received: from asgard (host201.201-252-64.telecom.net.ar [201.252.64.201]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id qBAApL7l016149 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 10 Dec 2012 10:51:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1355136686; bh=vzEFH2WxWWuUaexL4vhCqimvXi8EW2cGaFggaC0npFw=; h=From:To:Cc:Subject:Date; b=lJA5bBht6yj3iwD7x1lUp5Pt9op4PdlLCMVA+nbGnURwp4NiKNbv80lWNW/ZBt6P8 negrMgSRiJx+UcEGpcRZk2zKGc6cqKAkQRhgTd42ofZsJZKOjAv0R12lwPy/oRKvDI HM5XqecJIyDNhJAyye2y+8TxV5+ntdLZ8hmakKRc= Received: by asgard (sSMTP sendmail emulation); Mon, 10 Dec 2012 07:51:21 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 10 Dec 2012 07:51:20 -0300 Message-Id: <1355136680-29052-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] dnsmasq: fix build failure without DHCP X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Fixes http://autobuild.buildroot.net/results/26a9e152f533e467f68b72a373d0fc84d561eb87 Signed-off-by: Gustavo Zacarias --- .../dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch | 37 ++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch diff --git a/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch b/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch new file mode 100644 index 0000000..817d3b2 --- /dev/null +++ b/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch @@ -0,0 +1,37 @@ +From acd702292afebb8550acbfbe80638995545ccd10 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Mon, 10 Dec 2012 07:47:10 -0300 +Subject: [PATCH] Move parse_server outside the HAVE_DHCP ifdef + +Fixes build breakage when building without DHCP support. + +Signed-off-by: Gustavo Zacarias +--- + src/option.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/option.c b/src/option.c +index c1643a1..d6e323b 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -641,6 +641,8 @@ static char *set_prefix(char *arg) + return arg; + } + ++#endif ++ + char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags) + { + int source_port = 0, serv_port = NAMESERVER_PORT; +@@ -728,6 +730,8 @@ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_a + return NULL; + } + ++#ifdef HAVE_DHCP ++ + /* This is too insanely large to keep in-line in the switch */ + static int parse_dhcp_opt(char *errstr, char *arg, int flags) + { +-- +1.7.8.6 +