| 1 |
commit: 4b09ac140c17296903d3fab144a0bd38f204864a |
| 2 |
Author: Hans de Graaff <hans <AT> degraaff <DOT> org> |
| 3 |
AuthorDate: Fri Feb 22 19:02:03 2013 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 22 19:02:03 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-scripts.git;a=commit;h=4b09ac14 |
| 7 |
|
| 8 |
Patches for 1.9.3_p392. |
| 9 |
|
| 10 |
These are identical to 1.9.3_p385. |
| 11 |
|
| 12 |
--- |
| 13 |
patchsets/patches-1.9.3_p392/004_gfbsd7.patch | 37 +++++++++++++ |
| 14 |
.../patches-1.9.3_p392/005_no-undefined-ext.patch | 11 ++++ |
| 15 |
patchsets/patches-1.9.3_p392/009_no-gems.patch | 55 ++++++++++++++++++++ |
| 16 |
3 files changed, 103 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/patchsets/patches-1.9.3_p392/004_gfbsd7.patch b/patchsets/patches-1.9.3_p392/004_gfbsd7.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..7a80142 |
| 21 |
--- /dev/null |
| 22 |
+++ b/patchsets/patches-1.9.3_p392/004_gfbsd7.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+--- ruby-1.9.3-preview1.orig/configure.in |
| 25 |
++++ ruby-1.9.3-preview1/configure.in |
| 26 |
+@@ -1946,7 +1946,7 @@ if test "$rb_cv_binary_elf" = yes; then |
| 27 |
+ fi |
| 28 |
+ |
| 29 |
+ AS_CASE(["$target_os"], |
| 30 |
+-[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu], [ |
| 31 |
++[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu | freebsd* | dragonfly*], [ |
| 32 |
+ if test "$rb_cv_binary_elf" = no; then |
| 33 |
+ with_dln_a_out=yes |
| 34 |
+ else |
| 35 |
+@@ -2035,7 +2035,7 @@ if test "$with_dln_a_out" != yes; then |
| 36 |
+ [bsdi3*], [ AS_CASE(["$CC"], |
| 37 |
+ [*shlicc*], [ : ${LDSHARED='$(CC) -r'} |
| 38 |
+ rb_cv_dlopen=yes])], |
| 39 |
+- [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ |
| 40 |
++ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | freebsd7*], [ |
| 41 |
+ : ${LDSHARED='$(CC) -shared'} |
| 42 |
+ if test "$rb_cv_binary_elf" = yes; then |
| 43 |
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 44 |
+@@ -2048,7 +2048,6 @@ if test "$with_dln_a_out" != yes; then |
| 45 |
+ [freebsd*|dragonfly*], [ |
| 46 |
+ : ${LDSHARED='$(CC) -shared'} |
| 47 |
+ if test "$rb_cv_binary_elf" = yes; then |
| 48 |
+- LDFLAGS="$LDFLAGS -rdynamic" |
| 49 |
+ DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' |
| 50 |
+ else |
| 51 |
+ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" |
| 52 |
+@@ -2336,7 +2335,7 @@ AS_CASE("$enable_shared", [yes], [ |
| 53 |
+ [sunos4*], [ |
| 54 |
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' |
| 55 |
+ ], |
| 56 |
+- [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [ |
| 57 |
++ [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | freebsd7*], [ |
| 58 |
+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' |
| 59 |
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' |
| 60 |
+ if test "$load_relative" = yes; then |
| 61 |
|
| 62 |
diff --git a/patchsets/patches-1.9.3_p392/005_no-undefined-ext.patch b/patchsets/patches-1.9.3_p392/005_no-undefined-ext.patch |
| 63 |
new file mode 100644 |
| 64 |
index 0000000..f279932 |
| 65 |
--- /dev/null |
| 66 |
+++ b/patchsets/patches-1.9.3_p392/005_no-undefined-ext.patch |
| 67 |
@@ -0,0 +1,11 @@ |
| 68 |
+--- ruby-1.9.3-preview1.orig/configure.in |
| 69 |
++++ ruby-1.9.3-preview1/configure.in |
| 70 |
+@@ -2038,7 +2038,7 @@ if test "$with_dln_a_out" != yes; then |
| 71 |
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ |
| 72 |
+ : ${LDSHARED='$(CC) -shared'} |
| 73 |
+ if test "$rb_cv_binary_elf" = yes; then |
| 74 |
+- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 75 |
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
| 76 |
+ fi |
| 77 |
+ rb_cv_dlopen=yes], |
| 78 |
+ [interix*], [ : ${LDSHARED='$(CC) -shared'} |
| 79 |
|
| 80 |
diff --git a/patchsets/patches-1.9.3_p392/009_no-gems.patch b/patchsets/patches-1.9.3_p392/009_no-gems.patch |
| 81 |
new file mode 100644 |
| 82 |
index 0000000..0c60885 |
| 83 |
--- /dev/null |
| 84 |
+++ b/patchsets/patches-1.9.3_p392/009_no-gems.patch |
| 85 |
@@ -0,0 +1,55 @@ |
| 86 |
+--- ruby-1.9.3-preview1.orig/tool/rbinstall.rb |
| 87 |
++++ ruby-1.9.3-preview1/tool/rbinstall.rb |
| 88 |
+@@ -532,51 +532,7 @@ install?(:local, :comm, :man) do |
| 89 |
+ end |
| 90 |
+ |
| 91 |
+ install?(:ext, :comm, :gem) do |
| 92 |
+- $:.unshift(File.join(srcdir, "lib")) |
| 93 |
+- require("rubygems.rb") |
| 94 |
+- gem_dir = Gem.default_dir |
| 95 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir) |
| 96 |
+- prepare "default gems", gem_dir, directories |
| 97 |
+- |
| 98 |
+- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) |
| 99 |
+- File.foreach(File.join(srcdir, "defs/default_gems")) do |line| |
| 100 |
+- line.chomp! |
| 101 |
+- line.sub!(/\s*#.*/, '') |
| 102 |
+- next if line.empty? |
| 103 |
+- words = [] |
| 104 |
+- line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do |
| 105 |
+- words << ($2 ? $2.split : $1) |
| 106 |
+- end |
| 107 |
+- name, src, execs = *words |
| 108 |
+- next unless name and src |
| 109 |
+- execs ||= [] |
| 110 |
+- src = File.join(srcdir, src) |
| 111 |
+- version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next |
| 112 |
+- version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2] |
| 113 |
+- full_name = "#{name}-#{version}" |
| 114 |
+- |
| 115 |
+- puts "#{" "*30}#{name} #{version}" |
| 116 |
+- open_for_install(File.join(spec_dir, "#{full_name}.gemspec"), $data_mode) do |
| 117 |
+- <<-GEMSPEC |
| 118 |
+-Gem::Specification.new do |s| |
| 119 |
+- s.name = #{name.dump} |
| 120 |
+- s.version = #{version.dump} |
| 121 |
+- s.summary = "This #{name} is bundled with Ruby" |
| 122 |
+- s.executables = #{execs.inspect} |
| 123 |
+-end |
| 124 |
+- GEMSPEC |
| 125 |
+- end |
| 126 |
+- |
| 127 |
+- unless execs.empty? then |
| 128 |
+- bin_dir = File.join(gem_dir, 'gems', full_name, 'bin') |
| 129 |
+- makedirs(bin_dir) |
| 130 |
+- |
| 131 |
+- execs.each do |exec| |
| 132 |
+- exec = File.join(srcdir, 'bin', exec) |
| 133 |
+- install(exec, bin_dir, :mode => $prog_mode) |
| 134 |
+- end |
| 135 |
+- end |
| 136 |
+- end |
| 137 |
++ # gems are unbundled |
| 138 |
+ end |
| 139 |
+ |
| 140 |
+ parse_args() |
Archives