* [gentoo-commits] repo/proj/libressl:master commit in: dev-lang/ruby/files/2.6/, dev-lang/ruby/files/2.7/
@ 2023-05-15 14:11 orbea
0 siblings, 0 replies; only message in thread
From: orbea @ 2023-05-15 14:11 UTC (permalink / raw
To: gentoo-commits
commit: e887c57f40404c37a54a72df1fb86db597810cfd
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Mon May 15 14:10:31 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Mon May 15 14:10:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e887c57f
dev-lang/ruby: sync ::gentoo
Signed-off-by: orbea <orbea <AT> riseup.net>
dev-lang/ruby/files/2.6/002-autoconf-2.70.patch | 65 ----------------------
dev-lang/ruby/files/2.6/005_no-undefined-ext.patch | 11 ----
dev-lang/ruby/files/2.6/009_no-gems.patch | 39 -------------
.../ruby/files/2.6/010-default-gem-location.patch | 20 -------
dev-lang/ruby/files/2.7/002-autoconf-2.70.patch | 26 ---------
dev-lang/ruby/files/2.7/003-did-you-mean.patch | 16 ------
.../ruby/files/2.7/010-default-gem-location.patch | 20 -------
dev-lang/ruby/files/2.7/900-musl-coroutine.patch | 41 --------------
dev-lang/ruby/files/2.7/901-musl-stacksize.patch | 26 ---------
9 files changed, 264 deletions(-)
diff --git a/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch
deleted file mode 100644
index 576ed6c..0000000
--- a/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Mon, 16 Nov 2020 08:42:15 +0000
-Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70
-
-The failure initially noticed on `autoconf-2.69d` (soon to become 2.70):
-
-```
-$ ./configure
-./configure: line 8720: syntax error near unexpected token `fi'
-./configure: line 8720: `fi'
-```
-
-Before the change generated `./configure ` snippet looked like:
-
-```
- if ! $CC -E -xc - <<SRC >/dev/null
-then :
-
- #if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
- #error premature clang
- #endif
-SRC
- as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5
-fi
-```
-
-Note the newline that breaks here-document syntax.
-
-After the change the snippet does not use here-document.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a5e3dc76f6..4e4a52f066 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"],
- # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
- # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
- # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
-- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
-- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
-- @%:@error premature clang
-- @%:@endif
--SRC
-- AC_MSG_ERROR([clang version 3.0 or later is required])
-- ])
-+ AC_PREPROC_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
-+ @%:@error premature clang
-+ @%:@endif
-+ ])],
-+ [],
-+ [AC_MSG_ERROR([clang version 3.0 or later is required])])
- ])
-
- AS_CASE(["$target_os"],
---
-2.29.2
-
diff --git a/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch b/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch
deleted file mode 100644
index 1f0fdda..0000000
--- a/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac.~1~ 2017-12-15 10:43:40.000000000 +0100
-+++ b/configure.ac 2017-12-25 11:02:19.099076831 +0100
-@@ -3233,7 +3233,7 @@
- [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
- : ${LDSHARED='$(CC) -shared'}
- AS_IF([test "$rb_cv_binary_elf" = yes], [
-- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined"
- ])
- rb_cv_dlopen=yes],
- [interix*], [ : ${LDSHARED='$(CC) -shared'}
diff --git a/dev-lang/ruby/files/2.6/009_no-gems.patch b/dev-lang/ruby/files/2.6/009_no-gems.patch
deleted file mode 100644
index f98801d..0000000
--- a/dev-lang/ruby/files/2.6/009_no-gems.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/tool/rbinstall.rb.~1~ 2018-12-27 07:43:59.938638174 +0100
-+++ b/tool/rbinstall.rb 2018-12-27 07:51:09.096382161 +0100
-@@ -723,17 +723,7 @@
- # :startdoc:
-
- install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
-- install_default_gem('ext', srcdir) do |path|
-- # assume that gemspec and extconf.rb are placed in the same directory
-- success = false
-- begin
-- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l|
-- break success = true if /^TARGET\s*=/ =~ l
-- end
-- rescue Errno::ENOENT
-- end
-- success
-- end
-+ # Gems are unbundled in Gentoo
- end
-
- def load_gemspec(file)
-@@ -743,7 +743,7 @@
- end
-
- def install_default_gem(dir, srcdir)
-- gem_dir = Gem.default_dir
-+ gem_dir = ENV['GEM_DESTDIR'] ; puts "gem_dir for default gems = #{gem_dir}"
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
- prepare "default gems from #{dir}", gem_dir, directories
-
-@@ -777,7 +777,7 @@
- end
-
- install?(:ext, :comm, :gem, :'bundled-gems') do
-- gem_dir = Gem.default_dir
-+ gem_dir = ENV['GEM_DESTDIR']
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
- prepare "bundled gems", gem_dir, directories
- install_dir = with_destdir(gem_dir)
diff --git a/dev-lang/ruby/files/2.6/010-default-gem-location.patch b/dev-lang/ruby/files/2.6/010-default-gem-location.patch
deleted file mode 100644
index 7a50c35..0000000
--- a/dev-lang/ruby/files/2.6/010-default-gem-location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/tool/rbinstall.rb.~1~ 2019-01-24 02:00:07.000000000 +0100
-+++ b/tool/rbinstall.rb 2019-02-03 08:39:49.778007118 +0100
-@@ -806,7 +806,7 @@
- end
-
- def install_default_gem(dir, srcdir)
-- gem_dir = Gem.default_dir
-+ gem_dir = ENV['GEM_DESTDIR']
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
- prepare "default gems from #{dir}", gem_dir, directories
-
-@@ -844,7 +844,7 @@
- end
-
- install?(:ext, :comm, :gem, :'bundled-gems') do
-- gem_dir = Gem.default_dir
-+ gem_dir = ENV['GEM_DESTDIR']
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
- prepare "bundled gems", gem_dir, directories
- install_dir = with_destdir(gem_dir)
diff --git a/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch
deleted file mode 100644
index bea2bc1..0000000
--- a/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6766df2..bc503d6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -177,13 +177,14 @@ AS_CASE(["$host_os:$build_os"],
- # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
- # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
- # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
-- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
-- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
-- @%:@error premature clang
-- @%:@endif
--SRC
-- AC_MSG_ERROR([clang version 3.0 or later is required])
-- ])],
-+ AC_PREPROC_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
-+ @%:@error premature clang
-+ @%:@endif
-+ ])],
-+ [],
-+ [AC_MSG_ERROR([clang version 3.0 or later is required])])],
- [openbsd*:openbsd*], [
- AC_CHECK_TOOLS(CC, [cc])
- ])
diff --git a/dev-lang/ruby/files/2.7/003-did-you-mean.patch b/dev-lang/ruby/files/2.7/003-did-you-mean.patch
deleted file mode 100644
index 26beb65..0000000
--- a/dev-lang/ruby/files/2.7/003-did-you-mean.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ruby27/gem_prelude.rb 2021-04-28 19:07:46.875571113 +0200
-+++ ruby30/gem_prelude.rb 2021-04-28 19:07:35.971511765 +0200
-@@ -1,2 +1,11 @@
--require 'rubygems.rb' if defined?(Gem)
--require 'did_you_mean' if defined?(DidYouMean)
-+begin
-+ require 'rubygems'
-+rescue LoadError
-+ warn "`RubyGems' were not loaded."
-+end if defined?(Gem)
-+
-+begin
-+ require 'did_you_mean'
-+rescue LoadError
-+ warn "`did_you_mean' was not loaded."
-+end if defined?(DidYouMean)
diff --git a/dev-lang/ruby/files/2.7/010-default-gem-location.patch b/dev-lang/ruby/files/2.7/010-default-gem-location.patch
deleted file mode 100644
index 7a50c35..0000000
--- a/dev-lang/ruby/files/2.7/010-default-gem-location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/tool/rbinstall.rb.~1~ 2019-01-24 02:00:07.000000000 +0100
-+++ b/tool/rbinstall.rb 2019-02-03 08:39:49.778007118 +0100
-@@ -806,7 +806,7 @@
- end
-
- def install_default_gem(dir, srcdir)
-- gem_dir = Gem.default_dir
-+ gem_dir = ENV['GEM_DESTDIR']
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
- prepare "default gems from #{dir}", gem_dir, directories
-
-@@ -844,7 +844,7 @@
- end
-
- install?(:ext, :comm, :gem, :'bundled-gems') do
-- gem_dir = Gem.default_dir
-+ gem_dir = ENV['GEM_DESTDIR']
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
- prepare "bundled gems", gem_dir, directories
- install_dir = with_destdir(gem_dir)
diff --git a/dev-lang/ruby/files/2.7/900-musl-coroutine.patch b/dev-lang/ruby/files/2.7/900-musl-coroutine.patch
deleted file mode 100644
index ed47c54..0000000
--- a/dev-lang/ruby/files/2.7/900-musl-coroutine.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Adapted for Gentoo version 2.7.4
-
-From b570e7de87aaad8c903176d835e8124127f627b3 Mon Sep 17 00:00:00 2001
-From: Andrew Aladjev <aladjev.andrew@gmail.com>
-Date: Sat, 26 Sep 2020 12:58:06 +0300
-Subject: [PATCH] fixed default coroutine selection for musl
-
----
- configure.ac | 5 ++++-
- coroutine/copy/Context.c | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ab5d532c103b..084f0936c006 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2364,7 +2364,10 @@
- rb_cv_coroutine=copy
- ],
- [*], [
-- rb_cv_coroutine=ucontext
-+ AC_CHECK_FUNCS([getcontext swapcontext makecontext],
-+ [rb_cv_coroutine=ucontext],
-+ [rb_cv_coroutine=copy; break]
-+ )
- ]
- )
- 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
diff --git a/dev-lang/ruby/files/2.7/901-musl-stacksize.patch b/dev-lang/ruby/files/2.7/901-musl-stacksize.patch
deleted file mode 100644
index e5fcfce..0000000
--- a/dev-lang/ruby/files/2.7/901-musl-stacksize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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) {
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-15 14:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-15 14:11 [gentoo-commits] repo/proj/libressl:master commit in: dev-lang/ruby/files/2.6/, dev-lang/ruby/files/2.7/ orbea
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox