| 1 |
commit: 8161c1cf0cd986cfefdda9e5ef0d8752a33c9d30 |
| 2 |
Author: Hans de Graaff <hans <AT> degraaff <DOT> org> |
| 3 |
AuthorDate: Fri Feb 16 14:39:41 2018 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 16 14:39:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/ruby-scripts.git/commit/?id=8161c1cf |
| 7 |
|
| 8 |
add patchset for 2.5.0 |
| 9 |
|
| 10 |
patchsets/patches-2.5.0/005_no-undefined-ext.patch | 11 +++ |
| 11 |
patchsets/patches-2.5.0/009_no-gems.patch | 95 ++++++++++++++++++++++ |
| 12 |
2 files changed, 106 insertions(+) |
| 13 |
|
| 14 |
diff --git a/patchsets/patches-2.5.0/005_no-undefined-ext.patch b/patchsets/patches-2.5.0/005_no-undefined-ext.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..a6e1ebb |
| 17 |
--- /dev/null |
| 18 |
+++ b/patchsets/patches-2.5.0/005_no-undefined-ext.patch |
| 19 |
@@ -0,0 +1,11 @@ |
| 20 |
+--- configure.ac.~1~ 2017-12-15 10:43:40.000000000 +0100 |
| 21 |
++++ configure.ac 2017-12-25 11:02:19.099076831 +0100 |
| 22 |
+@@ -3233,7 +3233,7 @@ |
| 23 |
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [ |
| 24 |
+ : ${LDSHARED='$(CC) -shared'} |
| 25 |
+ AS_IF([test "$rb_cv_binary_elf" = yes], [ |
| 26 |
+- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 27 |
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
| 28 |
+ ]) |
| 29 |
+ rb_cv_dlopen=yes], |
| 30 |
+ [interix*], [ : ${LDSHARED='$(CC) -shared'} |
| 31 |
|
| 32 |
diff --git a/patchsets/patches-2.5.0/009_no-gems.patch b/patchsets/patches-2.5.0/009_no-gems.patch |
| 33 |
new file mode 100644 |
| 34 |
index 0000000..6e942cb |
| 35 |
--- /dev/null |
| 36 |
+++ b/patchsets/patches-2.5.0/009_no-gems.patch |
| 37 |
@@ -0,0 +1,95 @@ |
| 38 |
+--- tool/rbinstall.rb.~1~ 2017-10-30 06:45:20.000000000 +0100 |
| 39 |
++++ tool/rbinstall.rb 2017-12-25 11:06:53.340432435 +0100 |
| 40 |
+@@ -700,20 +700,10 @@ |
| 41 |
+ # :startdoc: |
| 42 |
+ |
| 43 |
+ install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do |
| 44 |
+- install_default_gem('lib', srcdir) |
| 45 |
++ # Gems are unbundled in Gentoo |
| 46 |
+ end |
| 47 |
+ install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do |
| 48 |
+- install_default_gem('ext', srcdir) do |path| |
| 49 |
+- # assume that gemspec and extconf.rb are placed in the same directory |
| 50 |
+- success = false |
| 51 |
+- begin |
| 52 |
+- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l| |
| 53 |
+- break success = true if /^TARGET\s*=/ =~ l |
| 54 |
+- end |
| 55 |
+- rescue Errno::ENOENT |
| 56 |
+- end |
| 57 |
+- success |
| 58 |
+- end |
| 59 |
++ # Gems are unbundled in Gentoo |
| 60 |
+ end |
| 61 |
+ |
| 62 |
+ def load_gemspec(file) |
| 63 |
+@@ -765,68 +755,7 @@ |
| 64 |
+ end |
| 65 |
+ |
| 66 |
+ install?(:ext, :comm, :gem, :'bundled-gems') do |
| 67 |
+- gem_dir = Gem.default_dir |
| 68 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 69 |
+- prepare "bundled gems", gem_dir, directories |
| 70 |
+- install_dir = with_destdir(gem_dir) |
| 71 |
+- installed_gems = {} |
| 72 |
+- options = { |
| 73 |
+- :install_dir => install_dir, |
| 74 |
+- :bin_dir => with_destdir(bindir), |
| 75 |
+- :domain => :local, |
| 76 |
+- :ignore_dependencies => true, |
| 77 |
+- :dir_mode => $dir_mode, |
| 78 |
+- :data_mode => $data_mode, |
| 79 |
+- :prog_mode => $prog_mode, |
| 80 |
+- :wrappers => true, |
| 81 |
+- :format_executable => true, |
| 82 |
+- } |
| 83 |
+- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" |
| 84 |
+- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir |
| 85 |
+- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| |
| 86 |
+- spec = load_gemspec(path) |
| 87 |
+- next unless spec.platform == Gem::Platform::RUBY |
| 88 |
+- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] |
| 89 |
+- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" |
| 90 |
+- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") |
| 91 |
+- spec.extensions[0] ||= "-" |
| 92 |
+- end |
| 93 |
+- ins = RbInstall::UnpackedInstaller.new(spec, options) |
| 94 |
+- puts "#{INDENT}#{spec.name} #{spec.version}" |
| 95 |
+- ins.install |
| 96 |
+- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |
| 97 |
+- unless spec.extensions.empty? |
| 98 |
+- install_recursive(ext, spec.extension_dir) |
| 99 |
+- end |
| 100 |
+- installed_gems[spec.full_name] = true |
| 101 |
+- end |
| 102 |
+- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} |
| 103 |
+- unless installed_gems.empty? |
| 104 |
+- install installed_gems, gem_dir+"/cache" |
| 105 |
+- end |
| 106 |
+- next if gems.empty? |
| 107 |
+- if defined?(Zlib) |
| 108 |
+- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) |
| 109 |
+- silent = Gem::SilentUI.new |
| 110 |
+- gems.each do |gem| |
| 111 |
+- inst = Gem::Installer.new(gem, options) |
| 112 |
+- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) |
| 113 |
+- begin |
| 114 |
+- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} |
| 115 |
+- rescue Gem::InstallError => e |
| 116 |
+- next |
| 117 |
+- end |
| 118 |
+- gemname = File.basename(gem) |
| 119 |
+- puts "#{INDENT}#{gemname}" |
| 120 |
+- end |
| 121 |
+- # fix directory permissions |
| 122 |
+- # TODO: Gem.install should accept :dir_mode option or something |
| 123 |
+- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) |
| 124 |
+- # fix .gemspec permissions |
| 125 |
+- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) |
| 126 |
+- else |
| 127 |
+- puts "skip installing bundled gems because of lacking zlib" |
| 128 |
+- end |
| 129 |
++ # Gems are unbundled in Gentoo |
| 130 |
+ end |
| 131 |
+ |
| 132 |
+ parse_args() |
Archives