[前][次][番号順一覧][スレッド一覧]

ruby-changes:23380

From: nobu <ko1@a...>
Date: Mon, 23 Apr 2012 10:43:47 +0900 (JST)
Subject: [ruby-changes:23380] nobu:r35431 (trunk): * configure.in: disable rubygems not to load rbconfig.rb before

nobu	2012-04-23 10:43:35 +0900 (Mon, 23 Apr 2012)

  New Revision: 35431

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35431

  Log:
    * configure.in: disable rubygems not to load rbconfig.rb before
      fake.rb.  [ruby-core:44492][Bug #6329]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 35430)
+++ configure.in	(revision 35431)
@@ -19,8 +19,13 @@
 	[
 		BASERUBY="ruby"
 	])
-test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
+if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then
+    if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'p 42' 2>/dev/null`" = 42; then
+	BASERUBY="$BASERUBY --disable=gems"
+    fi
+else
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+fi
 AC_SUBST(BASERUBY)
 
 AC_DEFUN([RUBY_MINGW32],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35430)
+++ ChangeLog	(revision 35431)
@@ -1,3 +1,8 @@
+Mon Apr 23 10:43:30 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: disable rubygems not to load rbconfig.rb before
+	  fake.rb.  [ruby-core:44492][Bug #6329]
+
 Sun Apr 22 20:26:06 2012  Tanaka Akira  <akr@f...>
 
 	* lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]