[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#39456] [PATCH 2/6] gnu: dnsmasq: Fix build with linux-libre-headers
From: |
Marius Bakke |
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 |
* 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 <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice
<address@hidden>
-;;; Copyright © 2016 Marius Bakke <address@hidden>
+;;; Copyright © 2016, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2017 Vasile Dumitrascu <address@hidden>
;;; Copyright © 2017 Gregor Giesen <address@hidden>
;;; Copyright © 2018 Oleg Pykhalov <address@hidden>
@@ -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