diff options
Diffstat (limited to 'dev-util/rt-tests')
| -rw-r--r-- | dev-util/rt-tests/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/rt-tests/files/rt-tests-2.8-glibc.patch | 55 | ||||
| -rw-r--r-- | dev-util/rt-tests/rt-tests-2.8.ebuild | 6 |
3 files changed, 62 insertions, 2 deletions
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest index 2e09d6d07ef6..3251e13510de 100644 --- a/dev-util/rt-tests/Manifest +++ b/dev-util/rt-tests/Manifest @@ -1,7 +1,8 @@ AUX rt-tests-2.7-musl.patch 10247 BLAKE2B fe5fde87f14efa50c90e593d4c8c858912131e25c0af90b2e90ba1d08ec50ec82d5114a1ea17c0f07b1ba4135689ff1862209dd79d9b021a2a8d5e58eca9ab3c SHA512 3aeafa3e6d2882960638cd57183983c0880f46c8116493bf76764b04a6087d88777438c1ff78d20217f879f3386fc4fac9b29a5ebb68f7d0e695ae3b324cedd7 +AUX rt-tests-2.8-glibc.patch 1520 BLAKE2B f53e78fc619d3fc9d060f21fa1df0d7900ae2700f2c80e3bf51d258f14800fd7a847fbaba0b6a1588e128b911c7ae073d1bebe8df5ab8703c1dec22cf1dabe94 SHA512 5e2bf757af29f362ffdfa811cb13fe32efc3436d702e04bef54e65b9afc3dcec72321dd60684c3a25fbff2aa62929e2cfdea7a23841d037a88af429457ed7b6f AUX rt-tests-2.8-musl.patch 10249 BLAKE2B 1843d51dd4cc422b53f49f9d99418a719414f5298c2b26a552dea4a269400a5a63b0d439f306b6135b6a534c2c4833221c766721089e9946d59ef348b1250626 SHA512 d6eeae9975d833b7686abc54b4e77ad874a23aa7aceb6b9dc6eba2b9149fb6bf4f03b929e7dbf1d66d7010fd5e2208fad90d6e638d722c550634b8871b52d089 DIST rt-tests-2.7.tar.xz 106864 BLAKE2B 89af0a92465ca29eb19adb6bb521be377dedb4153fc98bdcce48e1bad71803ed4aad2088227cfc679ce2441d09932acae437911535daec266b7ac2247fbad8d8 SHA512 6f2e523a6ff683473a222dc3b38abd34a06610c78b488d9d103643e410089d03820c76a4f40afaa4694d29f36e1aef6ced584cae9bad72921e3d633e36a5cda3 DIST rt-tests-2.8.tar.xz 108480 BLAKE2B 852143d6d8017f08cecf847e5feb8d59390373828826d75f5d22259208fc0c3e3966615039cfc9a832648377044ffd10cced481796d68426c70bb824b558c1f4 SHA512 e3fa03258cd1fe22a65c6af9ac17398dba79fbb5a92f6aacbbb06bfb677982abc421d699d2889850505e83d78b0605cced7dbfb176e023cc34bdd25ec819a3a5 EBUILD rt-tests-2.7.ebuild 916 BLAKE2B bb7156a6af5a00eec881410acf6fa23d86c68947ca8e82450662771e623139171c3ca9440bf4ac1891131588c9ee7c5bc996af6d00c3995943d812187a810d58 SHA512 8f38767eb8a0d60fcc7392646010933b562682826cd549cafe56788585c2a85ec499a820296cc468aaeb9b045b36097c7bff110f339364ea737e9ba5b46ef7be -EBUILD rt-tests-2.8.ebuild 916 BLAKE2B bb7156a6af5a00eec881410acf6fa23d86c68947ca8e82450662771e623139171c3ca9440bf4ac1891131588c9ee7c5bc996af6d00c3995943d812187a810d58 SHA512 8f38767eb8a0d60fcc7392646010933b562682826cd549cafe56788585c2a85ec499a820296cc468aaeb9b045b36097c7bff110f339364ea737e9ba5b46ef7be +EBUILD rt-tests-2.8.ebuild 961 BLAKE2B 85eb4fe4b6298c9fe382638c3bc7593513adc83f2b3a354001884572034d3aa7dff2a9cc7b88d00163c3a11dff11a8e392702a76da0e0d6c09e636545be68eb1 SHA512 44329b243808513a900d06b51998c7516376f9b57ff44fa4d5ac066f8baf0b1f2b29fee7ea523d169dec987f1aed4f44a96d0c24266e8e12919b1dffaadd27ad MISC metadata.xml 837 BLAKE2B b0d50d18a087e0e3adde1eeeeec4f9e3cf69d921d893c5f26f9205979d53cb3fb67c66da49a19646f00463456337edfa6482a129ba6f53bdefcc083b6420a4c8 SHA512 943f07d2ac45ada4c0e961f43543c7f8f5a1e96ae6a69e8e4f99ca47f7e43a8ca2525a299f9451b0877349542955e6428e6029dfae8e30e67ca970b883eb04d7 diff --git a/dev-util/rt-tests/files/rt-tests-2.8-glibc.patch b/dev-util/rt-tests/files/rt-tests-2.8-glibc.patch new file mode 100644 index 000000000000..7cfbdaa0236b --- /dev/null +++ b/dev-util/rt-tests/files/rt-tests-2.8-glibc.patch @@ -0,0 +1,55 @@ +From 280e198c39d1b17d0491d7c4e7afda97ae6c8e6f Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz <yselkowi@redhat.com> +Date: Wed, 29 Jan 2025 16:46:11 -0500 +Subject: [PATCH] Fix rt-tests build with glibc-2.41 + +The sched_*attr APIs were added to glibc +https://sourceware.org/git/?p=glibc.git;a=commit;h=21571ca0d70302909cf72707b2a7736cf12190a0 + +This fixes the build conflict in rt-tests with glibc-2.4 + +Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com> +Signed-off-by: John Kacur <jkacur@redhat.com> +--- + src/include/rt-sched.h | 2 ++ + src/lib/rt-sched.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h +index 80171c76e0ee..dfd7f45f51cc 100644 +--- a/src/include/rt-sched.h ++++ b/src/include/rt-sched.h +@@ -42,6 +42,7 @@ + #define __NR_sched_getattr 275 + #endif + ++#if ! __GLIBC_PREREQ(2, 41) + struct sched_attr { + uint32_t size; + uint32_t sched_policy; +@@ -67,5 +68,6 @@ int sched_getattr(pid_t pid, + struct sched_attr *attr, + unsigned int size, + unsigned int flags); ++#endif + + #endif /* __RT_SCHED_H__ */ +diff --git a/src/lib/rt-sched.c b/src/lib/rt-sched.c +index 8023bc70c473..2500abde26e4 100644 +--- a/src/lib/rt-sched.c ++++ b/src/lib/rt-sched.c +@@ -14,6 +14,7 @@ + + #include "rt-sched.h" + ++#if ! __GLIBC_PREREQ(2, 41) + int sched_setattr(pid_t pid, + const struct sched_attr *attr, + unsigned int flags) +@@ -28,3 +29,4 @@ int sched_getattr(pid_t pid, + { + return syscall(__NR_sched_getattr, pid, attr, size, flags); + } ++#endif +-- +2.47.1 diff --git a/dev-util/rt-tests/rt-tests-2.8.ebuild b/dev-util/rt-tests/rt-tests-2.8.ebuild index d11236401857..8749b0d1bb86 100644 --- a/dev-util/rt-tests/rt-tests-2.8.ebuild +++ b/dev-util/rt-tests/rt-tests-2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,6 +22,10 @@ DEPEND="${PYTHON_DEPS} sys-process/numactl" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-glibc.patch" +) + src_prepare() { default use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch" |