diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
| commit | 2891d29af8907ce881662f4a02844926d7a293c7 (patch) | |
| tree | 56979d96839d0827aa52008b81b746b4934d88df /dev-lang/ruby/files | |
| parent | de49812990871e1705b64051c35161d5e6400269 (diff) | |
gentoo resync : 31.12.2018
Diffstat (limited to 'dev-lang/ruby/files')
| -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 |
2 files changed, 50 insertions, 0 deletions
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 new file mode 100644 index 000000000000..1f0fdda08da5 --- /dev/null +++ b/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..f98801d50312 --- /dev/null +++ b/dev-lang/ruby/files/2.6/009_no-gems.patch @@ -0,0 +1,39 @@ +--- 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) |