From: Paul Brannan Date: 2008-04-01T23:36:47+09:00 Subject: [PATCH] fix build with -j --LTeJQqWS0MN7I/qa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Currently, if I try to build ruby from scratch with make -j, I get: ... distcc gcc -g -O2 -I. -I.ext/include/i686-linux -I./include -I. -DRUBY_EXPORT -D_GNU_SOURCE=1 -o strlcat.o -c ./missing/strlcat.c distcc gcc -g -O2 -I. -I.ext/include/i686-linux -I./include -I. -DRUBY_EXPORT -D_GNU_SOURCE=1 -o dmyext.o -c dmyext.c ./miniruby -I./lib ./enc/make_encdb.rb ./enc encdb.h make: ./miniruby: Command not found make: *** [encdb.h] Error 127 make: *** Waiting for unfinished jobs.... The attached patch attempts to address the issue. Paul --LTeJQqWS0MN7I/qa Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="dash_j.patch" From 51c9ed6c307b3dbeda1efc93ad816b35764be81b Mon Sep 17 00:00:00 2001 From: Paul Brannan Date: Tue, 1 Apr 2008 09:34:19 -0400 Subject: [PATCH] Fixed dependency problem that prevented using make -j. --- Makefile.in | 2 +- common.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 09275ce..db071f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -126,7 +126,7 @@ $(LIBRUBY_A): $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT) @-$(RANLIB) $@ 2> /dev/null || true -$(LIBRUBY_SO): +$(LIBRUBY_SO): $(MINIRUBY) @-$(PRE_LIBRUBY_UPDATE) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ diff --git a/common.mk b/common.mk index 6d0e1ca..515bbbc 100644 --- a/common.mk +++ b/common.mk @@ -364,12 +364,12 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb -encs: enc.mk +encs: enc.mk $(PREP) $(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans $(MAKE) -f enc.mk $(MFLAGS) enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ - $(srcdir)/lib/mkmf.rb $(RBCONFIG) + $(srcdir)/lib/mkmf.rb $(RBCONFIG) $(PREP) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@ .PRECIOUS: $(MKFILES) @@ -725,23 +725,23 @@ encdb: $(PREP) $(MINIRUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc encdb.h.new $(IFCHANGE) "encdb.h" "encdb.h.new" -encdb.h: +encdb.h: $(PREP) $(MINIRUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc $@ transdb: $(PREP) $(MINIRUBY) $(srcdir)/enc/trans/make_transdb.rb $(srcdir)/enc/trans transdb.h.new $(IFCHANGE) "transdb.h" "transdb.h.new" -transdb.h: +transdb.h: $(PREP) $(MINIRUBY) $(srcdir)/enc/trans/make_transdb.rb $(srcdir)/enc/trans $@ miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ -prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) +prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) $(PREP) $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@ -golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb +golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@ prereq: incs srcs preludes -- 1.5.4 --LTeJQqWS0MN7I/qa--