From 4187bba080530c5ca1c7dae9c233e88f3fc8f535 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jul 2024 08:06:16 +0100 Subject: gentoo auto-resync : 06:07:2024 - 08:06:15 --- dev-util/rt-tests/Manifest | 2 +- dev-util/rt-tests/files/rt-tests-2.7-musl.patch | 30 ++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) (limited to 'dev-util/rt-tests') diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest index ea7c2500e3c1..9fe289aba667 100644 --- a/dev-util/rt-tests/Manifest +++ b/dev-util/rt-tests/Manifest @@ -1,4 +1,4 @@ -AUX rt-tests-2.7-musl.patch 9421 BLAKE2B 065e63043123eb21eac788d509f3c7748baa9bea238c6e10ac414747fd06feccc3c488594277f2cd63d5a39869030f2dfb8cb278a24927b41019af3f12a37d40 SHA512 eaeecdafa8cb5ab9cfca3395b051db5b88343d8a0eea4dd29a9ca47d2147116cfce7d90b3b63e3824e057d5e9bfd2122b550050514fa3486ceadedbb164654b4 +AUX rt-tests-2.7-musl.patch 10247 BLAKE2B fe5fde87f14efa50c90e593d4c8c858912131e25c0af90b2e90ba1d08ec50ec82d5114a1ea17c0f07b1ba4135689ff1862209dd79d9b021a2a8d5e58eca9ab3c SHA512 3aeafa3e6d2882960638cd57183983c0880f46c8116493bf76764b04a6087d88777438c1ff78d20217f879f3386fc4fac9b29a5ebb68f7d0e695ae3b324cedd7 DIST rt-tests-2.7.tar.xz 106864 BLAKE2B 89af0a92465ca29eb19adb6bb521be377dedb4153fc98bdcce48e1bad71803ed4aad2088227cfc679ce2441d09932acae437911535daec266b7ac2247fbad8d8 SHA512 6f2e523a6ff683473a222dc3b38abd34a06610c78b488d9d103643e410089d03820c76a4f40afaa4694d29f36e1aef6ced584cae9bad72921e3d633e36a5cda3 EBUILD rt-tests-2.7.ebuild 916 BLAKE2B bb7156a6af5a00eec881410acf6fa23d86c68947ca8e82450662771e623139171c3ca9440bf4ac1891131588c9ee7c5bc996af6d00c3995943d812187a810d58 SHA512 8f38767eb8a0d60fcc7392646010933b562682826cd549cafe56788585c2a85ec499a820296cc468aaeb9b045b36097c7bff110f339364ea737e9ba5b46ef7be MISC metadata.xml 837 BLAKE2B b0d50d18a087e0e3adde1eeeeec4f9e3cf69d921d893c5f26f9205979d53cb3fb67c66da49a19646f00463456337edfa6482a129ba6f53bdefcc083b6420a4c8 SHA512 943f07d2ac45ada4c0e961f43543c7f8f5a1e96ae6a69e8e4f99ca47f7e43a8ca2525a299f9451b0877349542955e6428e6029dfae8e30e67ca970b883eb04d7 diff --git a/dev-util/rt-tests/files/rt-tests-2.7-musl.patch b/dev-util/rt-tests/files/rt-tests-2.7-musl.patch index 3edf92b7eb17..0dd53cd51ddc 100644 --- a/dev-util/rt-tests/files/rt-tests-2.7-musl.patch +++ b/dev-util/rt-tests/files/rt-tests-2.7-musl.patch @@ -7,7 +7,7 @@ There are a few problems: * pi stress: pthread_attr_setaffinity_np() is not supported * cyclictest: SIGEV_THREAD_ID is not supported - * hackbench: Fix include + * hackbench: Fix include, add missing casts * all: Fix sched_* calls With these changes applied, the rt-tests seem to run fine. @@ -17,7 +17,7 @@ Signed-off-by: Kurt Kanzenbach Makefile | 5 -- src/backfire/sendme.c | 1 src/cyclictest/cyclictest.c | 68 ++++------------------------------ - src/hackbench/hackbench.c | 4 +- + src/hackbench/hackbench.c | 12 +++--- src/include/musl.h | 28 ++++++++++++++ src/lib/rt-utils.c | 1 src/pi_tests/tst-mutexpi10.c | 2 + @@ -25,7 +25,7 @@ Signed-off-by: Kurt Kanzenbach src/ptsematest/ptsematest.c | 1 src/rt-migrate-test/rt-migrate-test.c | 1 src/sched_deadline/cyclicdeadline.c | 1 - 11 files changed, 47 insertions(+), 66 deletions(-) + 11 files changed, 51 insertions(+), 70 deletions(-) create mode 100644 src/include/musl.h --- a/Makefile @@ -248,6 +248,30 @@ Signed-off-by: Kurt Kanzenbach static unsigned int datasize = 100; static unsigned int loops = 100; static unsigned int num_groups = 10; +@@ -128,9 +130,9 @@ static int inet_socketpair(int fds[2]) + sin.sin_port = 0; + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); + +- if (bind(s1, &sin, len) < 0) ++ if (bind(s1, (struct sockaddr *)&sin, len) < 0) + barf("bind"); +- if (getsockname(s1, &sin, &len) < 0) ++ if (getsockname(s1, (struct sockaddr *)&sin, &len) < 0) + barf("getsockname"); + if (listen(s1, 10) < 0) + barf("listen"); +@@ -138,9 +140,9 @@ static int inet_socketpair(int fds[2]) + barf("ioctl"); + if (ioctl(s1, FIONBIO, &ul) < 0) + barf("ioctl"); +- if (connect(s2, &sin, len) < 0) ++ if (connect(s2, (struct sockaddr *)&sin, len) < 0) + barf("connect"); +- if ((fds[0] = accept(s1, &sin, &len)) < 0) ++ if ((fds[0] = accept(s1, (struct sockaddr *)&sin, &len)) < 0) + barf("accept"); + ul = 0; + if (ioctl(s2, FIONBIO, &ul) < 0) --- /dev/null +++ b/src/include/musl.h @@ -0,0 +1,28 @@ -- cgit v1.2.3