From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 May 2022 16:42:50 +0300
Subject: gentoo resync : 12.05.2022

---
 dev-lang/ruby/files/3.0/901-musl-stacksize.patch | 26 ++++++++++++++++++++++++
 dev-lang/ruby/files/3.1/900-musl-coroutine.patch | 17 ++++++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 dev-lang/ruby/files/3.0/901-musl-stacksize.patch

(limited to 'dev-lang/ruby/files')

diff --git a/dev-lang/ruby/files/3.0/901-musl-stacksize.patch b/dev-lang/ruby/files/3.0/901-musl-stacksize.patch
new file mode 100644
index 000000000000..e5fcfce2195e
--- /dev/null
+++ b/dev-lang/ruby/files/3.0/901-musl-stacksize.patch
@@ -0,0 +1,26 @@
+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
+ {
+     native_main_thread.id = pthread_self();
+ 
+-#if MAINSTACKADDR_AVAILABLE
++#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)
+
+ #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) {
+
diff --git a/dev-lang/ruby/files/3.1/900-musl-coroutine.patch b/dev-lang/ruby/files/3.1/900-musl-coroutine.patch
index a323cdd6e770..ed47c54e29c7 100644
--- a/dev-lang/ruby/files/3.1/900-musl-coroutine.patch
+++ b/dev-lang/ruby/files/3.1/900-musl-coroutine.patch
@@ -1,4 +1,4 @@
-Adapted for Gentoo version 3.0.2
+Adapted for Gentoo version 2.7.4
 
 From b570e7de87aaad8c903176d835e8124127f627b3 Mon Sep 17 00:00:00 2001
 From: Andrew Aladjev <aladjev.andrew@gmail.com>
@@ -17,7 +17,7 @@ index ab5d532c103b..084f0936c006 100644
 @@ -2364,7 +2364,10 @@
              rb_cv_coroutine=copy
          ],
-         [
+         [*], [
 -            rb_cv_coroutine=ucontext
 +            AC_CHECK_FUNCS([getcontext swapcontext makecontext],
 +                [rb_cv_coroutine=ucontext],
@@ -26,3 +26,16 @@ index ab5d532c103b..084f0936c006 100644
          ]
      )
      AC_MSG_RESULT(${rb_cv_coroutine})
+diff --git a/coroutine/copy/Context.c b/coroutine/copy/Context.c
+index c1b4144e9857..94a7f57f7d89 100644
+--- a/coroutine/copy/Context.c
++++ b/coroutine/copy/Context.c
+@@ -5,6 +5,8 @@
+  *  Copyright, 2019, by Samuel Williams.
+ */
+ 
++#include <sys/types.h>
++
+ #include "Context.h"
+ 
+ // http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html
-- 
cgit v1.2.3