diff options
| author |   Sam James <sam@gentoo.org> | 2022-08-23 23:56:18 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-08-23 23:56:18 +0100 |
| commit | 944a39cd04fc0960a85035148475d9ad81e7dd51 (patch) | |
| tree | e2e933108be6f5e4c67a3773a2097334216e0727 | |
| parent | dev-util/ostree: fix build w/ glibc 2.36, fix configure bashism (diff) | |
| download | gentoo-944a39cd.tar.gz gentoo-944a39cd.tar.bz2 gentoo-944a39cd.zip | |
sys-boot/plymouth: fix build w/ glibc 2.36
Closes: https://bugs.gentoo.org/863839
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | sys-boot/plymouth/files/plymouth-22.02.122-glibc-2.36.patch | 25 | ||||
| -rw-r--r-- | sys-boot/plymouth/plymouth-22.02.122-r1.ebuild | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/sys-boot/plymouth/files/plymouth-22.02.122-glibc-2.36.patch b/sys-boot/plymouth/files/plymouth-22.02.122-glibc-2.36.patch new file mode 100644 index 000000000000..b1da112732e3 --- /dev/null +++ b/sys-boot/plymouth/files/plymouth-22.02.122-glibc-2.36.patch @@ -0,0 +1,25 @@ +https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/5f1e43c00039a7fe1fff768b91a05a695fb4a53d +https://bugs.gentoo.org/863839 + +From 5f1e43c00039a7fe1fff768b91a05a695fb4a53d Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Wed, 3 Aug 2022 15:23:33 -0400 +Subject: [PATCH] ply-utils: Drop linux/fs.h include + +It was needed long ago for a function we no longer even have. + +Now it's causing compile errors on Fedora 37 because it's conflicting +with sys/mount.h. + +This commit drops it. +--- a/src/libply/ply-utils.c ++++ b/src/libply/ply-utils.c +@@ -46,7 +46,6 @@ + #include <sys/user.h> + #include <sys/wait.h> + #include <time.h> +-#include <linux/fs.h> + #include <linux/vt.h> + + #include <dlfcn.h> +GitLab diff --git a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild index d87fe2ec7e36..075ed34ae073 100644 --- a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild +++ b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild @@ -52,6 +52,7 @@ DOC_CONTENTS=" PATCHES=( "${FILESDIR}"/0.9.3-glibc-sysmacros.patch + "${FILESDIR}"/${P}-glibc-2.36.patch ) src_prepare() { |