Ruby 1.9: update and reenable parallel build, since there's a chance it was fixed.

This commit is contained in:
Evgeny Egorochkin 2013-06-11 00:13:20 +03:00
parent 24b1c74b7c
commit dbcfef8c41
2 changed files with 20 additions and 4 deletions

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
sha256 = "1ymq5lhp3fz0j3cs65521aihcnivbfrn76in900ccxd0msgfmld9"; sha256 = "0w1avj8qfskvkgvrjxxc1cxjm14bf1v60ipvcl5q3zpn9k14k2cx";
}; };
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@ -32,8 +32,9 @@ stdenv.mkDerivation rec {
++ (op gdbmSupport gdbm) ++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml); ++ (op yamlSupport libyaml);
enableParallelBuilding = false; enableParallelBuilding = true;
patches = [ ./ruby19-parallel-install.patch ];
configureFlags = ["--enable-shared" "--enable-pthread"]; configureFlags = ["--enable-shared" "--enable-pthread"];
installFlags = stdenv.lib.optionalString docSupport "install-doc"; installFlags = stdenv.lib.optionalString docSupport "install-doc";
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
passthru = rec { passthru = rec {
majorVersion = "1.9"; majorVersion = "1.9";
minorVersion = "3"; minorVersion = "3";
patchLevel = "194"; patchLevel = "429";
libPath = "lib/ruby/${majorVersion}"; libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}";
}; };

View File

@ -0,0 +1,15 @@
Index: ruby-1.9.3-p392/lib/mkmf.rb
===================================================================
--- ruby-1.9.3-p392.orig/lib/mkmf.rb
+++ ruby-1.9.3-p392/lib/mkmf.rb
@@ -2039,8 +2039,8 @@ static: $(STATIC_LIB)#{$extout ? " insta
end
for f in files
dest = "#{dir}/#{File.basename(f)}"
- mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
- mfile.print("#{dest}: #{f}\n")
+ mfile.print("install-rb#{sfx}: #{dest}\n")
+ mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\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")