Patchset for ruby 1.9.3_p286.

Identical to our previous release.

4 files changed, 155 insertions, 0 deletions

diff --git a/patchsets/patches-1.9.3_p286/004_gfbsd7.patch b/patchsets/patches-1.9.3_p286/004_gfbsd7.patch
new file mode 100644
index 0000000..7a80142
--- /dev/null
+++ b/patchsets/patches-1.9.3_p286/004_gfbsd7.patch
@@ -0,0 +1,37 @@
+--- ruby-1.9.3-preview1.orig/configure.in
++++ ruby-1.9.3-preview1/configure.in
+@@ -1946,7 +1946,7 @@ if test "$rb_cv_binary_elf" = yes; then
+ fi
+ 
+ AS_CASE(["$target_os"],
+-[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu], [
++[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu | freebsd* | dragonfly*], [
+     if test "$rb_cv_binary_elf" = no; then
+ 	with_dln_a_out=yes
+     else
+@@ -2035,7 +2035,7 @@ if test "$with_dln_a_out" != yes; then
+ 	[bsdi3*], [	AS_CASE(["$CC"],
+ 			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
+ 					rb_cv_dlopen=yes])],
+-	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
++	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | freebsd7*], [
+ 			: ${LDSHARED='$(CC) -shared'}
+ 			if test "$rb_cv_binary_elf" = yes; then
+ 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+@@ -2048,7 +2048,6 @@ if test "$with_dln_a_out" != yes; then
+ 	[freebsd*|dragonfly*], [
+ 			: ${LDSHARED='$(CC) -shared'}
+ 			if test "$rb_cv_binary_elf" = yes; then
+-			    LDFLAGS="$LDFLAGS -rdynamic"
+ 			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
+ 			else
+ 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+@@ -2336,7 +2335,7 @@ AS_CASE("$enable_shared", [yes], [
+     [sunos4*], [
+ 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+ 	],
+-    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
++    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | freebsd7*], [
+ 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
+ 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+ 	if test "$load_relative" = yes; then
diff --git a/patchsets/patches-1.9.3_p286/005_no-undefined-ext.patch b/patchsets/patches-1.9.3_p286/005_no-undefined-ext.patch
new file mode 100644
index 0000000..f279932
--- /dev/null
+++ b/patchsets/patches-1.9.3_p286/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-1.9.3_p286/009_no-gems.patch b/patchsets/patches-1.9.3_p286/009_no-gems.patch
new file mode 100644
index 0000000..0c60885
--- /dev/null
+++ b/patchsets/patches-1.9.3_p286/009_no-gems.patch
@@ -0,0 +1,55 @@
+--- ruby-1.9.3-preview1.orig/tool/rbinstall.rb
++++ ruby-1.9.3-preview1/tool/rbinstall.rb
+@@ -532,51 +532,7 @@ install?(:local, :comm, :man) do
+ end
+ 
+ install?(:ext, :comm, :gem) do
+-  $:.unshift(File.join(srcdir, "lib"))
+-  require("rubygems.rb")
+-  gem_dir = Gem.default_dir
+-  directories = Gem.ensure_gem_subdirectories(gem_dir)
+-  prepare "default gems", gem_dir, directories
+-
+-  spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0])
+-  File.foreach(File.join(srcdir, "defs/default_gems")) do |line|
+-    line.chomp!
+-    line.sub!(/\s*#.*/, '')
+-    next if line.empty?
+-    words = []
+-    line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do
+-      words << ($2 ? $2.split : $1)
+-    end
+-    name, src, execs = *words
+-    next unless name and src
+-    execs ||= []
+-    src = File.join(srcdir, src)
+-    version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
+-    version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2]
+-    full_name = "#{name}-#{version}"
+-
+-    puts "#{" "*30}#{name} #{version}"
+-    open_for_install(File.join(spec_dir, "#{full_name}.gemspec"), $data_mode) do
+-      <<-GEMSPEC
+-Gem::Specification.new do |s|
+-  s.name = #{name.dump}
+-  s.version = #{version.dump}
+-  s.summary = "This #{name} is bundled with Ruby"
+-  s.executables = #{execs.inspect}
+-end
+-      GEMSPEC
+-    end
+-
+-    unless execs.empty? then
+-      bin_dir = File.join(gem_dir, 'gems', full_name, 'bin')
+-      makedirs(bin_dir)
+-
+-      execs.each do |exec|
+-        exec = File.join(srcdir, 'bin', exec)
+-        install(exec, bin_dir, :mode => $prog_mode)
+-      end
+-    end
+-  end
++  # gems are unbundled
+ end
+ 
+ parse_args()
diff --git a/patchsets/patches-1.9.3_p286/010_mkmf-parallel-install.patch b/patchsets/patches-1.9.3_p286/010_mkmf-parallel-install.patch
new file mode 100644
index 0000000..b3d3724
--- /dev/null
+++ b/patchsets/patches-1.9.3_p286/010_mkmf-parallel-install.patch
@@ -0,0 +1,52 @@
+Index: ruby-1.9.3-p194/lib/mkmf.rb
+===================================================================
+--- ruby-1.9.3-p194.orig/lib/mkmf.rb
++++ ruby-1.9.3-p194/lib/mkmf.rb
+@@ -1998,11 +1998,10 @@ static: $(STATIC_LIB)#{$extout ? " insta
+   dirs = []
+   mfile.print "install: install-so install-rb\n\n"
+   sodir = (dir = "$(RUBYARCHDIR)").dup
+-  mfile.print("install-so: ")
+   if target
+     f = "$(DLLIB)"
+     dest = "#{dir}/#{f}"
+-    mfile.puts dir, "install-so: #{dest}"
++    mfile.puts "install-so: #{dest}"
+     if $extout
+       mfile.print "clean-so::\n"
+       mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
+@@ -2015,7 +2014,7 @@ static: $(STATIC_LIB)#{$extout ? " insta
+       end
+     end
+   else
+-    mfile.puts "Makefile"
++    mfile.puts "install-so: Makefile"
+   end
+   mfile.print("install-rb: pre-install-rb install-rb-default\n")
+   mfile.print("install-rb-default: pre-install-rb-default\n")
+@@ -2024,14 +2023,11 @@ static: $(STATIC_LIB)#{$extout ? " insta
+   for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]]
+     files = install_files(mfile, i, nil, srcprefix) or next
+     for dir, *files in files
+-      unless dirs.include?(dir)
+-        dirs << dir
+-        mfile.print "pre-install-rb#{sfx}: #{dir}\n"
+-      end
+       for f in files
+         dest = "#{dir}/#{File.basename(f)}"
+-        mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
++        mfile.print("install-rb#{sfx}: #{dest}\n")
+         mfile.print("#{dest}: #{f}\n")
++        mfile.print("\t$(Q) $(MAKEDIRS) $(@D#{sep})\n")
+         mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
+         if defined?($installed_list) and !$extout
+           mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
+@@ -2054,8 +2050,6 @@ static: $(STATIC_LIB)#{$extout ? " insta
+       end
+     end
+   end
+-  dirs.unshift(sodir) if target and !dirs.include?(sodir)
+-  dirs.each {|d| mfile.print "#{d}:\n\t$(Q) $(MAKEDIRS) $@\n"}
+ 
+   mfile.print <<-SITEINSTALL
+