summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>2012-05-11 22:44:10 -0700
committerDiego Elio Pettenò <flameeyes@flameeyes.eu>2012-05-11 22:44:10 -0700
commitc3a0cdfedc7e29e8d4ca0ddda9685b56ec48856b (patch)
tree14ac5e6b2ca53c4364038c3adc86e369087c3db3 /patchsets
parentAdd patches for 1.9.3_p194 including one from me to fix mkfs parallel install. (diff)
downloadruby-scripts-c3a0cdfedc7e29e8d4ca0ddda9685b56ec48856b.tar.gz
ruby-scripts-c3a0cdfedc7e29e8d4ca0ddda9685b56ec48856b.tar.bz2
ruby-scripts-c3a0cdfedc7e29e8d4ca0ddda9685b56ec48856b.zip
Fix parallel install patch.
Diffstat (limited to 'patchsets')
-rw-r--r--patchsets/patches-1.9.3_p194/010_mkmf-parallel-install.patch26
1 files changed, 24 insertions, 2 deletions
diff --git a/patchsets/patches-1.9.3_p194/010_mkmf-parallel-install.patch b/patchsets/patches-1.9.3_p194/010_mkmf-parallel-install.patch
index 65d2268..b3d3724 100644
--- a/patchsets/patches-1.9.3_p194/010_mkmf-parallel-install.patch
+++ b/patchsets/patches-1.9.3_p194/010_mkmf-parallel-install.patch
@@ -2,7 +2,29 @@ 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
-@@ -2024,14 +2024,11 @@ static: $(STATIC_LIB)#{$extout ? " insta
+@@ -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
@@ -19,7 +41,7 @@ Index: ruby-1.9.3-p194/lib/mkmf.rb
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 +2051,6 @@ static: $(STATIC_LIB)#{$extout ? " insta
+@@ -2054,8 +2050,6 @@ static: $(STATIC_LIB)#{$extout ? " insta
end
end
end