Project

General

Profile

Backport #9837

make-snapshot in trunk fails to package 1.9.3

Added by nobu (Nobuyoshi Nakada) about 5 years ago. Updated about 5 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
[ruby-dev:48218]

Description

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 $@

Associated revisions

Revision fac59ac7
Added by usa (Usaku NAKAMURA) about 5 years ago

  • 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Revision 45941
Added by usa (Usaku NAKAMURA) about 5 years ago

  • 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]

History

Updated by usa (Usaku NAKAMURA) about 5 years ago

これはだいぶ前から困っていたんですが、1.9のmake-snapshotを使うことで回避していました。
そうか、これが原因だったのかあ。

#2

Updated by usa (Usaku NAKAMURA) about 5 years ago

  • 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]

Also available in: Atom PDF