diff options
author | Mike Gilbert <floppym@gentoo.org> | 2018-03-26 17:17:04 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2018-03-26 17:17:23 -0400 |
commit | 9463c487ae1bf6a960ea83fafcda88b17c90ef06 (patch) | |
tree | 8b6b504fa3f304ab56e0e38ada6641fdbadd3a92 /sys-apps/systemd | |
parent | sys-apps/systemd: Recover keyword dropped by mistake (diff) | |
download | gentoo-9463c487ae1bf6a960ea83fafcda88b17c90ef06.tar.gz gentoo-9463c487ae1bf6a960ea83fafcda88b17c90ef06.tar.bz2 gentoo-9463c487ae1bf6a960ea83fafcda88b17c90ef06.zip |
sys-apps/systemd: fix build with util-linux-2.32
Closes: https://bugs.gentoo.org/651304
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r-- | sys-apps/systemd/files/238-libmount-include.patch | 72 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-236-r5.ebuild | 1 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-237-r3.ebuild | 1 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-238-r1.ebuild | 1 |
4 files changed, 75 insertions, 0 deletions
diff --git a/sys-apps/systemd/files/238-libmount-include.patch b/sys-apps/systemd/files/238-libmount-include.patch new file mode 100644 index 000000000000..6a02dff65e40 --- /dev/null +++ b/sys-apps/systemd/files/238-libmount-include.patch @@ -0,0 +1,72 @@ +From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 26 Mar 2018 17:34:53 +0200 +Subject: [PATCH] core: don't include libmount.h in a header file (#8580) + +linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_* +definitions. + +To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h +should be included. And missing.h must be included last. + +Without this, building systemd may fail with: + +In file included from [...]/libmount/libmount.h:31:0, + from ../systemd-238/src/core/manager.h:23, + from ../systemd-238/src/core/emergency-action.h:37, + from ../systemd-238/src/core/unit.h:34, + from ../systemd-238/src/core/dbus-timer.h:25, + from ../systemd-238/src/core/timer.c:26: +[...]/sys/mount.h:57:2: error: expected identifier before numeric constant +--- + src/core/dbus-execute.c | 1 + + src/core/manager.h | 3 ++- + src/core/mount.c | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 7344623ebf6..c342093bca4 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -18,6 +18,7 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + ++#include <sys/mount.h> + #include <sys/prctl.h> + #include <stdio_ext.h> + +diff --git a/src/core/manager.h b/src/core/manager.h +index 28c5da225b1..e09e0cdf5e9 100644 +--- a/src/core/manager.h ++++ b/src/core/manager.h +@@ -20,7 +20,6 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + +-#include <libmount.h> + #include <stdbool.h> + #include <stdio.h> + +@@ -34,6 +33,8 @@ + #include "list.h" + #include "ratelimit.h" + ++struct libmnt_monitor; ++ + /* Enforce upper limit how many names we allow */ + #define MANAGER_MAX_NAMES 131072 /* 128K */ + +diff --git a/src/core/mount.c b/src/core/mount.c +index 0e755da5c02..0154ebda5d6 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -23,6 +23,8 @@ + #include <stdio.h> + #include <sys/epoll.h> + ++#include <libmount.h> ++ + #include "sd-messages.h" + + #include "alloc-util.h" diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild index ed62d0a6f44e..aed2113e91aa 100644 --- a/sys-apps/systemd/systemd-236-r5.ebuild +++ b/sys-apps/systemd/systemd-236-r5.ebuild @@ -148,6 +148,7 @@ src_unpack() { src_prepare() { local PATCHES=( + "${FILESDIR}/238-libmount-include.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) diff --git a/sys-apps/systemd/systemd-237-r3.ebuild b/sys-apps/systemd/systemd-237-r3.ebuild index 466126ca683a..d0254ee71dbe 100644 --- a/sys-apps/systemd/systemd-237-r3.ebuild +++ b/sys-apps/systemd/systemd-237-r3.ebuild @@ -150,6 +150,7 @@ src_unpack() { src_prepare() { local PATCHES=( "${FILESDIR}/237-0001-networkctl-display-type.patch" + "${FILESDIR}/238-libmount-include.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) diff --git a/sys-apps/systemd/systemd-238-r1.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild index 2898aa322ed8..2903bb82e515 100644 --- a/sys-apps/systemd/systemd-238-r1.ebuild +++ b/sys-apps/systemd/systemd-238-r1.ebuild @@ -150,6 +150,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch" "${FILESDIR}/238-0002-core-do-not-free-heap-allocated-strings-8391.patch" + "${FILESDIR}/238-libmount-include.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) |