From 30782b4396896544d4f4858367f1a85321aeee5d Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 5 Oct 2018 14:27:32 +0900
Subject: [PATCH 1/3] sd-netlink: sort headers and include net/ethernet.h

---
 src/systemd/sd-netlink.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h
index 7650ff4532..604edb9cfb 100644
--- a/src/systemd/sd-netlink.h
+++ b/src/systemd/sd-netlink.h
@@ -18,10 +18,11 @@
 ***/
 
 #include <inttypes.h>
+#include <linux/neighbour.h>
+#include <linux/rtnetlink.h>
+#include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <netinet/in.h>
-#include <linux/rtnetlink.h>
-#include <linux/neighbour.h>
 
 #include "sd-event.h"
 

From d6263ee4d5fa01e306e517da65344bff0b892767 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 5 Oct 2018 14:29:05 +0900
Subject: [PATCH 2/3] meson: also run compile tests for not installed systemd
 headers

Follow-up for b62f9008668a5330c61b4de7e0d48147bcd1edf7 (#10277).
---
 src/systemd/meson.build | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 849502921d..470328cc5d 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -17,20 +17,25 @@ _systemd_headers = '''
 # https://github.com/mesonbuild/meson/issues/1633
 systemd_headers = files(_systemd_headers)
 
-#  sd-dhcp6-client.h
-#  sd-dhcp6-lease.h
-#  sd-dhcp-client.h
-#  sd-dhcp-lease.h
-#  sd-dhcp-server.h
-#  sd-ipv4acd.h
-#  sd-ipv4ll.h
-#  sd-lldp.h
-#  sd-ndisc.h
-#  sd-netlink.h
-#  sd-network.h
-#  sd-path.h
+_not_installed_headers = '''
+        sd-dhcp6-client.h
+        sd-dhcp6-lease.h
+        sd-dhcp-client.h
+        sd-dhcp-lease.h
+        sd-dhcp-server.h
+        sd-ipv4acd.h
+        sd-ipv4ll.h
+        sd-lldp.h
+        sd-ndisc.h
+        sd-netlink.h
+        sd-network.h
+        sd-path.h
+        sd-radv.h
+        sd-utf8.h
+'''.split()
+
+# The following headers do not pass tests.
 #  sd-resolve.h
-#  sd-utf8.h
 
 install_headers(
         systemd_headers,
@@ -62,7 +67,7 @@ if cxx.found()
         endif
 endif
 
-foreach header : _systemd_headers
+foreach header : _systemd_headers + _not_installed_headers
         foreach opt : opts
                 name = ''.join([header, ':'] + opt)
                 if want_tests != 'false'

From 35f2cb28419cd6a7205d1e24032dac166c38faca Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 5 Oct 2018 14:40:44 +0900
Subject: [PATCH 3/3] sd-resolve: make struct addrinfo defined

---
 src/systemd/meson.build  | 4 +---
 src/systemd/sd-resolve.h | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 470328cc5d..dde0aaf781 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -31,12 +31,10 @@ _not_installed_headers = '''
         sd-network.h
         sd-path.h
         sd-radv.h
+        sd-resolve.h
         sd-utf8.h
 '''.split()
 
-# The following headers do not pass tests.
-#  sd-resolve.h
-
 install_headers(
         systemd_headers,
         '_sd-common.h',
diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h
index 954b9f0206..5695119b40 100644
--- a/src/systemd/sd-resolve.h
+++ b/src/systemd/sd-resolve.h
@@ -17,6 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+/* 'struct addrinfo' needs _GNU_SOURCE */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
 #include <inttypes.h>
 #include <netdb.h>
 #include <sys/socket.h>