commit: e130632f6a562e467cd51718766c23aa75e6ce8c Author: Hans de Graaff <hans <AT> degraaff <DOT> org> AuthorDate: Mon Dec 25 07:31:11 2017 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Mon Dec 25 07:31:11 2017 +0000 URL: https://gitweb.gentoo.org/proj/ruby-scripts.git/commit/?id=e130632f
Add patchset for ruby 2.4.3 patchsets/patches-2.4.3/002_windows_crossdev.patch | 64 ++++++++++++ patchsets/patches-2.4.3/005_no-undefined-ext.patch | 11 ++ patchsets/patches-2.4.3/009_no-gems.patch | 112 +++++++++++++++++++++ 3 files changed, 187 insertions(+) diff --git a/patchsets/patches-2.4.3/002_windows_crossdev.patch b/patchsets/patches-2.4.3/002_windows_crossdev.patch new file mode 100644 index 0000000..7e290d4 --- /dev/null +++ b/patchsets/patches-2.4.3/002_windows_crossdev.patch @@ -0,0 +1,64 @@ +Bug: https://bugs.gentoo.org/show_bug.cgi?id=618878 + +A few patches to make crossdev for mingw-w64 play nice with ruby's ebuilds. +Basic gist is that without the following patch to configure.in ruby-2.4.1 +hardcodes 240 into the shared, static, and import library names, which when +built with the current ruby ebuilds results in names like libx64-msvcrt-ruby24240.dll and so on. The patch is in ruby-trunk[1], but may take a while +to hit the tarballs that gentoo uses. + +Index: configure.in +=================================================================== +--- a/configure.in (revision 57824) ++++ b/configure.in (revision 57825) +@@ -3825,7 +3825,23 @@ + + AC_ARG_WITH(soname, + AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]), +- [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) ++ [RUBY_SO_NAME=$withval], ++ [ ++ AS_CASE(["$target_os"], ++ [darwin*], [ ++ RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)' ++ ], ++ [cygwin*], [ ++ RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' ++ ], ++ [mingw*], [ ++ RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' ++ AS_IF([test x"${target_cpu}" != xi386], [ ++ RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" ++ ]) ++ ], ++ [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) ++ ]) + + LIBRUBY_LDSHARED=$LDSHARED + LIBRUBY_DLDFLAGS=$DLDFLAGS +@@ -3925,7 +3941,6 @@ + SOLIBS='-lm -lc' + ], + [darwin*], [ +- RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)' + LIBRUBY_LDSHARED='$(CC) -dynamiclib' + if test "$load_relative" = yes; then + libprefix="@executable_path/../${libdir_basename}" +@@ -4157,7 +4172,6 @@ + fi + ], + [cygwin*|mingw*], [ +- RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0' + LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' + AS_CASE(["$target_os"], + [cygwin*], [ +@@ -4167,10 +4181,6 @@ + fi + ], + [mingw*], [ +- RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}" +- if test x"${target_cpu}" != xi386; then +- RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" +- fi + if test x"$enable_shared" = xyes; then + LIBRUBY_SO='$(RUBY_SO_NAME)'.dll + LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' diff --git a/patchsets/patches-2.4.3/005_no-undefined-ext.patch b/patchsets/patches-2.4.3/005_no-undefined-ext.patch new file mode 100644 index 0000000..f279932 --- /dev/null +++ b/patchsets/patches-2.4.3/005_no-undefined-ext.patch @@ -0,0 +1,11 @@ +--- ruby-1.9.3-preview1.orig/configure.in ++++ ruby-1.9.3-preview1/configure.in +@@ -2038,7 +2038,7 @@ if test "$with_dln_a_out" != yes; then + [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ + : ${LDSHARED='$(CC) -shared'} + if test "$rb_cv_binary_elf" = yes; then +- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" ++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" + fi + rb_cv_dlopen=yes], + [interix*], [ : ${LDSHARED='$(CC) -shared'} diff --git a/patchsets/patches-2.4.3/009_no-gems.patch b/patchsets/patches-2.4.3/009_no-gems.patch new file mode 100644 index 0000000..cdf503c --- /dev/null +++ b/patchsets/patches-2.4.3/009_no-gems.patch @@ -0,0 +1,112 @@ +--- tool/rbinstall.rb.~1~ 2016-10-17 09:17:07.000000000 +0200 ++++ tool/rbinstall.rb 2016-12-25 08:20:07.873491045 +0100 +@@ -695,107 +695,11 @@ + # :startdoc: + + install?(:ext, :comm, :gem) do +- gem_dir = Gem.default_dir +- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) +- prepare "default gems", gem_dir, directories +- +- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) +- default_spec_dir = "#{spec_dir}/default" +- makedirs(default_spec_dir) +- +- gems = Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").map {|src| +- spec = Gem::Specification.load(src) || raise("invalid spec in #{src}") +- file_collector = RbInstall::Specs::FileCollector.new(File.dirname(src)) +- files = file_collector.collect +- next if files.empty? +- spec.files = files +- spec +- } +- gems.compact.sort_by(&:name).each do |gemspec| +- full_name = "#{gemspec.name}-#{gemspec.version}" +- +- puts "#{" "*30}#{gemspec.name} #{gemspec.version}" +- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec") +- open_for_install(gemspec_path, $data_mode) do +- gemspec.to_ruby +- end +- +- unless gemspec.executables.empty? then +- bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir) +- makedirs(bin_dir) +- +- execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)} +- install(execs, bin_dir, :mode => $script_mode) +- end +- end ++ # gems are unbundled in Gentoo + end + + install?(:ext, :comm, :gem) do +- gem_dir = Gem.default_dir +- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) +- prepare "bundle gems", gem_dir, directories +- install_dir = with_destdir(gem_dir) +- installed_gems = {} +- options = { +- :install_dir => install_dir, +- :bin_dir => with_destdir(bindir), +- :domain => :local, +- :ignore_dependencies => true, +- :dir_mode => $dir_mode, +- :data_mode => $data_mode, +- :prog_mode => $prog_mode, +- :wrappers => true, +- :format_executable => true, +- } +- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" +- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir +- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| +- dir = File.dirname(path) +- spec = Dir.chdir(dir) { +- Gem::Specification.load(File.basename(path)) +- } +- next unless spec.platform == Gem::Platform::RUBY +- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] +- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" +- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") +- spec.extensions[0] ||= "-" +- end +- ins = RbInstall::UnpackedInstaller.new(spec, options) +- puts "#{" "*30}#{spec.name} #{spec.version}" +- ins.install +- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) +- unless spec.extensions.empty? +- install_recursive(ext, spec.extension_dir) +- end +- installed_gems[spec.full_name] = true +- end +- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} +- unless installed_gems.empty? +- install installed_gems, gem_dir+"/cache" +- end +- next if gems.empty? +- if defined?(Zlib) +- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) +- silent = Gem::SilentUI.new +- gems.each do |gem| +- inst = Gem::Installer.new(gem, options) +- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) +- begin +- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} +- rescue Gem::InstallError => e +- next +- end +- gemname = File.basename(gem) +- puts "#{" "*30}#{gemname}" +- end +- # fix directory permissions +- # TODO: Gem.install should accept :dir_mode option or something +- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) +- # fix .gemspec permissions +- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) +- else +- puts "skip installing bundle gems because of lacking zlib" +- end ++ # gems are unbundled in Gentoo + end + + parse_args()
