From: Marius Bakke <mbakke@fastmail.com>
To: 39456@debbugs.gnu.org
Subject: [bug#39456] [PATCH 2/6] gnu: dnsmasq: Fix build with linux-libre-headers >= 5.2.
Date: Thu, 6 Feb 2020 19:02:41 +0100 [thread overview]
Message-ID: <20200206180245.12470-2-mbakke@fastmail.com> (raw)
In-Reply-To: <20200206180245.12470-1-mbakke@fastmail.com>
* gnu/packages/dns.scm (dnsmasq)[source](modules, snippet): New fields.
---
gnu/packages/dns.scm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 7c52722cb6..a1f506905f 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
@@ -83,7 +83,17 @@
version ".tar.xz"))
(sha256
(base32
- "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"))))
+ "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; The SIOCGSTAMP ioctl is defined in <linux/sockios.h> instead
+ ;; of <asm/sockios.h> starting with linux-libre-headers 5.2.
+ ;; Remove this for dnsmasq versions > 2.80.
+ (substitute* "src/dnsmasq.h"
+ (("#if defined\\(HAVE_LINUX_NETWORK\\)" all)
+ (string-append all "\n#include <linux/sockios.h>")))
+ #t))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
--
2.25.0
next prev parent reply other threads:[~2020-02-06 18:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 17:59 [bug#39456] [PATCH core-updates 0/6] glibc & binutils update Marius Bakke
2020-02-06 18:02 ` [bug#39456] [PATCH 1/6] gnu: linux-libre-headers: Update to 5.4.16 Marius Bakke
2020-02-06 18:02 ` Marius Bakke [this message]
2020-02-06 18:02 ` [bug#39456] [PATCH 3/6] gnu: binutils: Update to 2.34 Marius Bakke
2020-02-06 18:02 ` [bug#39456] [PATCH 4/6] gnu: cross-binutils: Fix xtensa build with Binutils 2.34 Marius Bakke
2020-02-06 18:02 ` [bug#39456] [PATCH 5/6] gnu: glibc: Update to 2.31 Marius Bakke
2020-02-06 18:02 ` [bug#39456] [PATCH 6/6] gnu: libfaketime: Fix build with glibc 2.31 Marius Bakke
2020-02-15 21:18 ` bug#39456: [PATCH core-updates 0/6] glibc & binutils update Marius Bakke
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200206180245.12470-2-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=39456@debbugs.gnu.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).