[Buildroot] [git commit branch/2019.02.x] package/dnsmasq: fix build with kernel >= 5.2
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2020-03-14 17:26:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=af4c90d6ece4783e8489330f29504d8e5a0aac98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2019.02.x Fixes: - http://autobuild.buildroot.org/results/edfe5d208f1626903ce16cd481a29e54f9e8c611 Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 5f867b988bf2b5ccaba459dd93f08add53190794) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- ...003-Fix-build-after-y2038-changes-in-glib.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+)
diff --git a/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch b/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch
new file mode 100644
index 0000000000..fdde33a664
--- /dev/null
+++ b/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch@@ -0,0 +1,29 @@ +From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <jslaby@suse.cz> +Date: Wed, 24 Jul 2019 17:34:48 +0100 +Subject: [PATCH] Fix build after y2038 changes in glib. + +SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. + +[Retrieved from: +http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=3052ce208acf602f0163166dcefb7330d537cedb] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + src/dnsmasq.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index ff3204a..3ef04ad 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -137,6 +137,7 @@ typedef unsigned long long u64; + #endif + + #if defined(HAVE_LINUX_NETWORK) ++#include <linux/sockios.h> + #include <linux/capability.h> + /* There doesn't seem to be a universally-available + userspace header for these. */ +-- +1.7.10.4 +