From 928a42ff84fbe39dae2af9ee924ec30413591510 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 31 Jan 2023 12:12:04 +0000 Subject: [PATCH] systemd: fix build issue with glibc-2.36 --- .../systemd-0900-build-with-glibc-2.36.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/sysutils/systemd/patches/systemd-0900-build-with-glibc-2.36.patch diff --git a/packages/sysutils/systemd/patches/systemd-0900-build-with-glibc-2.36.patch b/packages/sysutils/systemd/patches/systemd-0900-build-with-glibc-2.36.patch new file mode 100644 index 0000000000..d70ce782de --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-0900-build-with-glibc-2.36.patch @@ -0,0 +1,20 @@ +commit 134db60f65ecea9a5c6536541a74a6ff5e4167de +Author: Rudi Heitbaum +Date: Tue Jan 31 12:06:56 2023 +0000 + + glibc: Conditionally #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 + +diff --git a/src/basic/linux/btrfs.h b/src/basic/linux/btrfs.h +index 0a53bdc38a..74ed9088bd 100644 +--- a/src/basic/linux/btrfs.h ++++ b/src/basic/linux/btrfs.h +@@ -26,7 +26,9 @@ extern "C" { + + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #define BTRFS_IOCTL_MAGIC 0x94 + #define BTRFS_VOL_NAME_MAX 255