diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-01 12:00:42 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-15 22:02:55 +0100 |
| commit | 645772e4b916dfb05c7f9d8f7dbf3d40e2e1b5f4 (patch) | |
| tree | 25c4e40f7326913a6385c33adc8a384a0e5aec39 | |
| parent | 429243a43ab8891b1ca4adc36838576a3de0a50b (diff) | |
| download | guix-645772e4b916dfb05c7f9d8f7dbf3d40e2e1b5f4.tar.gz | |
gnu: dnsmasq: Fix build with linux-libre-headers >= 5.2.
* gnu/packages/dns.scm (dnsmasq)[source](modules, snippet): New fields.
| -rw-r--r-- | gnu/packages/dns.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 3a42a98bc4..652fc5968a 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))) |