diff options
Diffstat (limited to 'dev-lang/ruby/files/2.6')
| -rw-r--r-- | dev-lang/ruby/files/2.6/002-autoconf-2.70.patch | 65 | ||||
| -rw-r--r-- | dev-lang/ruby/files/2.6/005_no-undefined-ext.patch | 11 | ||||
| -rw-r--r-- | dev-lang/ruby/files/2.6/009_no-gems.patch | 39 | ||||
| -rw-r--r-- | dev-lang/ruby/files/2.6/010-default-gem-location.patch | 20 |
4 files changed, 0 insertions, 135 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 576ed6c759bd..000000000000 --- 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 1f0fdda08da5..000000000000 --- 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 f98801d50312..000000000000 --- 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 7a50c35ff6c9..000000000000 --- 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) |