From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/files/, app-benchmarks/bootchart2/
Date: Tue, 16 Aug 2022 00:19:54 +0000 (UTC) [thread overview]
Message-ID: <1660608937.63adc98ac12a26bce1c16dd372f050073375b628.sam@gentoo> (raw)
commit: 63adc98ac12a26bce1c16dd372f050073375b628
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 00:15:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 00:15:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63adc98a
app-benchmarks/bootchart2: fix build w/ glibc 2.36
Closes: https://bugs.gentoo.org/864205
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../bootchart2/bootchart2-0.14.9-r1.ebuild | 1 +
.../files/bootchart2-0.14.9-glibc-2.36.patch | 24 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
index 6cd79686f3af..83e421f91a32 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
@@ -31,6 +31,7 @@ CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
PATCHES=(
"${FILESDIR}"/${PN}-0.14.8-no-compressed-man.patch
+ "${FILESDIR}"/${P}-glibc-2.36.patch
)
src_prepare() {
diff --git a/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch
new file mode 100644
index 000000000000..720079e9d794
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/864205
+https://github.com/xrmx/bootchart/commit/8591c1e3edaea8f17396e3d2819d9064b2818cfb
+
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2022 20:39:01 -0700
+Subject: [PATCH] Do not include linux/fs.h
+
+This header is not needed to be included anymore, moreover it conflicts
+with sys/mount.h from glibc 2.36+ see [1]
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/collector/collector.c
++++ b/collector/collector.c
+@@ -34,7 +34,6 @@
+
+ #include <sys/mount.h>
+ #include <sys/sysmacros.h>
+-#include <linux/fs.h>
+ #include <linux/genetlink.h>
+ #include <linux/taskstats.h>
+ #include <linux/cgroupstats.h>
+
next reply other threads:[~2022-08-16 0:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-16 0:19 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-30 15:10 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/files/, app-benchmarks/bootchart2/ Andreas Sturmlechner
2018-01-30 8:23 Mike Frysinger
2016-04-21 4:22 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1660608937.63adc98ac12a26bce1c16dd372f050073375b628.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox