[Closed] make-snapshot in trunk fails to package 1.9.3

Issue #9837 has been updated by Usaku NAKAMURA.

Status changed from Open to Closed
% Done changed from 0 to 100

Applied in changeset r45941.


  • common.mk: need to quote $BASERUBY because it may includes options.
    this change is only for release management, not bug fix.
    [Backport #9837] [ruby-dev:48218]

Backport #9837: make-snapshot in trunk fails to package 1.9.3

  • Author: Nobuyoshi N.
  • Status: Closed
  • Priority: Normal
  • Assignee:

trunkのtool/make-snapshotで1.9.3パッケージを作ろうとすると、ext/ripper/ripper.cを作るところで失敗します。

generating ext/ripper/ripper.c
make: unrecognized option '--disable-gem'
Usage: make [options] [target] ...
Options:
(snip)
make: *** [ext/ripper/ripper.c] Error 2
prerequisites failed

trunkでは$(BASERUBY)--disable-gemsが追加されるので、makeに解釈されないように""で囲む必要があります。

diff --git a/common.mk b/common.mk
index b26ba72..2e57492 100644
--- a/common.mk
+++ b/common.mk
@@ -863,7 +863,7 @@ $(REVISION_H): $(srcdir)/version.h 
$(srcdir)/ChangeLog $(srcdir)/tool/file2lastr
 $(srcdir)/ext/ripper/ripper.c: parse.y
   $(ECHO) generating $@
   $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
-    Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. RUBY=$(BASERUBY)
+    Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. RUBY="$(BASERUBY)"

 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
   $(ECHO) generating $@