| 1 |
commit: 63adc98ac12a26bce1c16dd372f050073375b628 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 16 00:15:37 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 16 00:15:37 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63adc98a |
| 7 |
|
| 8 |
app-benchmarks/bootchart2: fix build w/ glibc 2.36 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/864205 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../bootchart2/bootchart2-0.14.9-r1.ebuild | 1 + |
| 14 |
.../files/bootchart2-0.14.9-glibc-2.36.patch | 24 ++++++++++++++++++++++ |
| 15 |
2 files changed, 25 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild |
| 18 |
index 6cd79686f3af..83e421f91a32 100644 |
| 19 |
--- a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild |
| 20 |
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild |
| 21 |
@@ -31,6 +31,7 @@ CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS" |
| 22 |
|
| 23 |
PATCHES=( |
| 24 |
"${FILESDIR}"/${PN}-0.14.8-no-compressed-man.patch |
| 25 |
+ "${FILESDIR}"/${P}-glibc-2.36.patch |
| 26 |
) |
| 27 |
|
| 28 |
src_prepare() { |
| 29 |
|
| 30 |
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 |
| 31 |
new file mode 100644 |
| 32 |
index 000000000000..720079e9d794 |
| 33 |
--- /dev/null |
| 34 |
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch |
| 35 |
@@ -0,0 +1,24 @@ |
| 36 |
+https://bugs.gentoo.org/864205 |
| 37 |
+https://github.com/xrmx/bootchart/commit/8591c1e3edaea8f17396e3d2819d9064b2818cfb |
| 38 |
+ |
| 39 |
+From: Khem Raj <raj.khem@×××××.com> |
| 40 |
+Date: Sat, 6 Aug 2022 20:39:01 -0700 |
| 41 |
+Subject: [PATCH] Do not include linux/fs.h |
| 42 |
+ |
| 43 |
+This header is not needed to be included anymore, moreover it conflicts |
| 44 |
+with sys/mount.h from glibc 2.36+ see [1] |
| 45 |
+ |
| 46 |
+[1] https://sourceware.org/glibc/wiki/Release/2.36 |
| 47 |
+ |
| 48 |
+Signed-off-by: Khem Raj <raj.khem@×××××.com> |
| 49 |
+--- a/collector/collector.c |
| 50 |
++++ b/collector/collector.c |
| 51 |
+@@ -34,7 +34,6 @@ |
| 52 |
+ |
| 53 |
+ #include <sys/mount.h> |
| 54 |
+ #include <sys/sysmacros.h> |
| 55 |
+-#include <linux/fs.h> |
| 56 |
+ #include <linux/genetlink.h> |
| 57 |
+ #include <linux/taskstats.h> |
| 58 |
+ #include <linux/cgroupstats.h> |
| 59 |
+ |
Archives