| 1 |
commit: 23b764fb235e8b10b99219941ff10b843e69a93f |
| 2 |
Author: Hans de Graaff <hans <AT> degraaff <DOT> org> |
| 3 |
AuthorDate: Wed Apr 27 06:58:42 2016 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 27 06:58:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/ruby-scripts.git/commit/?id=23b764fb |
| 7 |
|
| 8 |
ruby 2.2.5 patchset |
| 9 |
|
| 10 |
patchsets/patches-2.2.5/004_gfbsd7.patch | 37 +++++++++ |
| 11 |
patchsets/patches-2.2.5/005_no-undefined-ext.patch | 11 +++ |
| 12 |
patchsets/patches-2.2.5/009_no-gems.patch | 88 ++++++++++++++++++++++ |
| 13 |
3 files changed, 136 insertions(+) |
| 14 |
|
| 15 |
diff --git a/patchsets/patches-2.2.5/004_gfbsd7.patch b/patchsets/patches-2.2.5/004_gfbsd7.patch |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..450d714 |
| 18 |
--- /dev/null |
| 19 |
+++ b/patchsets/patches-2.2.5/004_gfbsd7.patch |
| 20 |
@@ -0,0 +1,37 @@ |
| 21 |
+--- configure.in.orig 2013-05-05 19:36:02.800254192 +0200 |
| 22 |
++++ configure.in 2013-05-05 19:37:56.573346196 +0200 |
| 23 |
+@@ -2156,7 +2156,7 @@ |
| 24 |
+ fi |
| 25 |
+ |
| 26 |
+ AS_CASE(["$target_os"], |
| 27 |
+-[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu | nacl], [ |
| 28 |
++[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu | nacl | freebsd* | dragonfly*], [ |
| 29 |
+ if test "$rb_cv_binary_elf" = no; then |
| 30 |
+ with_dln_a_out=yes |
| 31 |
+ else |
| 32 |
+@@ -2249,7 +2249,7 @@ |
| 33 |
+ [bsdi3*], [ AS_CASE(["$CC"], |
| 34 |
+ [*shlicc*], [ : ${LDSHARED='$(CC) -r'} |
| 35 |
+ rb_cv_dlopen=yes])], |
| 36 |
+- [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ |
| 37 |
++ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | freebsd7*], [ |
| 38 |
+ : ${LDSHARED='$(CC) -shared'} |
| 39 |
+ if test "$rb_cv_binary_elf" = yes; then |
| 40 |
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 41 |
+@@ -2262,7 +2262,6 @@ |
| 42 |
+ [freebsd*|dragonfly*], [ |
| 43 |
+ : ${LDSHARED='$(CC) -shared'} |
| 44 |
+ if test "$rb_cv_binary_elf" = yes; then |
| 45 |
+- LDFLAGS="$LDFLAGS -rdynamic" |
| 46 |
+ DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@' |
| 47 |
+ else |
| 48 |
+ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' |
| 49 |
+@@ -2638,7 +2637,7 @@ |
| 50 |
+ [sunos4*], [ |
| 51 |
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' |
| 52 |
+ ], |
| 53 |
+- [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [ |
| 54 |
++ [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | freebsd7*], [ |
| 55 |
+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR" |
| 56 |
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' |
| 57 |
+ if test "$load_relative" = yes; then |
| 58 |
|
| 59 |
diff --git a/patchsets/patches-2.2.5/005_no-undefined-ext.patch b/patchsets/patches-2.2.5/005_no-undefined-ext.patch |
| 60 |
new file mode 100644 |
| 61 |
index 0000000..f279932 |
| 62 |
--- /dev/null |
| 63 |
+++ b/patchsets/patches-2.2.5/005_no-undefined-ext.patch |
| 64 |
@@ -0,0 +1,11 @@ |
| 65 |
+--- ruby-1.9.3-preview1.orig/configure.in |
| 66 |
++++ ruby-1.9.3-preview1/configure.in |
| 67 |
+@@ -2038,7 +2038,7 @@ if test "$with_dln_a_out" != yes; then |
| 68 |
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ |
| 69 |
+ : ${LDSHARED='$(CC) -shared'} |
| 70 |
+ if test "$rb_cv_binary_elf" = yes; then |
| 71 |
+- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 72 |
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
| 73 |
+ fi |
| 74 |
+ rb_cv_dlopen=yes], |
| 75 |
+ [interix*], [ : ${LDSHARED='$(CC) -shared'} |
| 76 |
|
| 77 |
diff --git a/patchsets/patches-2.2.5/009_no-gems.patch b/patchsets/patches-2.2.5/009_no-gems.patch |
| 78 |
new file mode 100644 |
| 79 |
index 0000000..a67cbf8 |
| 80 |
--- /dev/null |
| 81 |
+++ b/patchsets/patches-2.2.5/009_no-gems.patch |
| 82 |
@@ -0,0 +1,88 @@ |
| 83 |
+--- tool/rbinstall.rb.~1~ 2015-03-25 04:33:14.000000000 +0100 |
| 84 |
++++ tool/rbinstall.rb 2015-04-14 07:07:01.169073427 +0200 |
| 85 |
+@@ -654,83 +654,11 @@ |
| 86 |
+ # :startdoc: |
| 87 |
+ |
| 88 |
+ install?(:ext, :comm, :gem) do |
| 89 |
+- $:.unshift(File.join(srcdir, "lib")) |
| 90 |
+- require("rubygems.rb") |
| 91 |
+- gem_dir = Gem.default_dir |
| 92 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 93 |
+- prepare "default gems", gem_dir, directories |
| 94 |
+- |
| 95 |
+- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) |
| 96 |
+- default_spec_dir = "#{spec_dir}/default" |
| 97 |
+- makedirs(default_spec_dir) |
| 98 |
+- |
| 99 |
+- gems = {} |
| 100 |
+- File.foreach(File.join(srcdir, "defs/default_gems")) do |line| |
| 101 |
+- line.chomp! |
| 102 |
+- line.sub!(/\s*#.*/, '') |
| 103 |
+- next if line.empty? |
| 104 |
+- words = [] |
| 105 |
+- line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do |
| 106 |
+- words << ($2 ? $2.split : $1) |
| 107 |
+- end |
| 108 |
+- name, base_dir, src, execs = *words |
| 109 |
+- next unless name and base_dir and src |
| 110 |
+- |
| 111 |
+- src = File.join(srcdir, src) |
| 112 |
+- base_dir = File.join(srcdir, base_dir) |
| 113 |
+- specgen = RbInstall::Specs::Generator.new(name, base_dir, src, execs || []) |
| 114 |
+- gems[name] ||= specgen |
| 115 |
+- end |
| 116 |
+- |
| 117 |
+- Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").each do |src| |
| 118 |
+- specgen = RbInstall::Specs::Reader.new(src) |
| 119 |
+- gems[specgen.gemspec.name] ||= specgen |
| 120 |
+- end |
| 121 |
+- |
| 122 |
+- gems.sort.each do |name, specgen| |
| 123 |
+- gemspec = specgen.gemspec |
| 124 |
+- base_dir = specgen.src.sub(/\A#{Regexp.escape(srcdir)}\//, "") |
| 125 |
+- full_name = "#{gemspec.name}-#{gemspec.version}" |
| 126 |
+- |
| 127 |
+- puts "#{" "*30}#{gemspec.name} #{gemspec.version}" |
| 128 |
+- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec") |
| 129 |
+- open_for_install(gemspec_path, $data_mode) do |
| 130 |
+- specgen.spec_source |
| 131 |
+- end |
| 132 |
+- |
| 133 |
+- unless gemspec.executables.empty? then |
| 134 |
+- bin_dir = File.join(gem_dir, 'gems', full_name, 'bin') |
| 135 |
+- makedirs(bin_dir) |
| 136 |
+- |
| 137 |
+- execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)} |
| 138 |
+- install(execs, bin_dir, :mode => $prog_mode) |
| 139 |
+- end |
| 140 |
+- end |
| 141 |
++ # gems are unbundled in Gentoo. |
| 142 |
+ end |
| 143 |
+ |
| 144 |
+ install?(:ext, :comm, :gem) do |
| 145 |
+- begin |
| 146 |
+- require "zlib" |
| 147 |
+- rescue LoadError |
| 148 |
+- end |
| 149 |
+- if defined?(Zlib) |
| 150 |
+- require 'pathname' |
| 151 |
+- gem_dir = Gem.default_dir |
| 152 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 153 |
+- prepare "bundle gems", gem_dir, directories |
| 154 |
+- Dir.glob(srcdir+'/gems/*.gem').each do |gem| |
| 155 |
+- Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(Gem.dir), :domain => :local, :ignore_dependencies => true |
| 156 |
+- gemname = Pathname(gem).basename |
| 157 |
+- puts "#{" "*30}#{gemname}" |
| 158 |
+- end |
| 159 |
+- # fix directory permissions |
| 160 |
+- # TODO: Gem.install should accept :dir_mode option or something |
| 161 |
+- File.chmod($dir_mode, *Dir.glob(with_destdir(Gem.dir)+"/**/")) |
| 162 |
+- # fix .gemspec permissions |
| 163 |
+- File.chmod($data_mode, *Dir.glob(with_destdir(Gem.dir)+"/specifications/*.gemspec")) |
| 164 |
+- else |
| 165 |
+- puts "skip installing bundle gems because of lacking zlib" |
| 166 |
+- end |
| 167 |
++ # gems are unbundled in Gentoo. |
| 168 |
+ end |
| 169 |
+ |
| 170 |
+ parse_args() |
Archives