gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-04 01:37:34 -08:00
Code Issues Projects Releases Wiki Activity

dev-lang/ruby: redo musl patch for ruby 3.2

Browse Source 
Closes: https://bugs.gentoo.org/899902
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
This commit is contained in:
Hans de Graaff 2023-03-10 17:48:23 +01:00
parent 1e8726b33b
commit a4c209b762
No known key found for this signature in database
GPG Key ID: DB347F938654FA34
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dev-lang/ruby/files/3.2/901-musl-stacksize.patch
View File

@ -1,11 +1,6 @@
musl has a conservative stacksize, as compared to glibc, so treat it
like other systems with such stacksize
diff --git a/thread_pthread.c b/thread_pthread.c
index 951885ffa0..e2d662143b 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -721,7 +721,7 @@ ruby_init_stack(volatile VALUE *addr
--- a/thread_pthread.c 2023-02-08 05:02:20.000000000 +0100
+++ b/thread_pthread.c 2023-03-10 17:46:25.694739053 +0100
@@ -1033,7 +1033,7 @@
{
native_main_thread.id = pthread_self();
@ -13,14 +8,13 @@ index 951885ffa0..e2d662143b 100644
+#if MAINSTACKADDR_AVAILABLE && !(defined(__linux__) && !defined(__GLIBC__))
if (native_main_thread.stack_maxsize) return;
{
void* stackaddr;
@@ -1680,7 +1680,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
void* stackaddr;
@@ -2090,7 +2090,7 @@
#ifdef STACKADDR_AVAILABLE
if (get_stack(&base, &size) == 0) {
-# ifdef __APPLE__
+# if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__))
if (pthread_equal(th->thread_id, native_main_thread.id)) {
struct rlimit rlim;
if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {
if (pthread_equal(th->nt->thread_id, native_main_thread.id)) {
struct rlimit rlim;
if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {

2
dev-lang/ruby/ruby-3.2.1.ebuild
View File

@ -75,7 +75,7 @@ src_prepare() {
eapply "${FILESDIR}"/"${SLOT}"/010*.patch
if use elibc_musl ; then
eapply "${FILESDIR}"/3.1/901-musl-*.patch
eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
fi
einfo "Unbundling gems..."