nobu	2013-10-14 12:32:54 +0900 (Mon, 14 Oct 2013)

  New Revision: 43280

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

  Log:
    ruby.c: load statically linked extensions before rubygems
    
    * ruby.c (process_options): load statically linked extensions before
      rubygems, because of ext/thread.

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43279)
+++ ChangeLog	(revision 43280)
@@ -1,4 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Mon Oct 14 12:22:24 2013  Nobuyoshi Nakada  <nobu@r...>
+Mon Oct 14 12:32:52 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (process_options): load statically linked extensions before
+	  rubygems, because of ext/thread.
 
 	* ruby.c (process_options): use gem_prelude instead of requiring
 	  rubygems directly when --enable=gems is given.
Index: ruby.c
===================================================================
--- ruby.c	(revision 43279)
+++ ruby.c	(revision 43280)
@@ -561,7 +561,6 @@ require_libraries(VALUE *req_list) https://github.com/ruby/ruby/blob/trunk/ruby.c#L561
     int prev_parse_in_eval = th->parse_in_eval;
     th->parse_in_eval = 0;
 
-    Init_ext();		/* should be called here for some reason :-( */
     CONST_ID(require, "require");
     while (list && RARRAY_LEN(list) > 0) {
 	VALUE feature = rb_ary_shift(list);
@@ -1448,6 +1447,7 @@ process_options(int argc, char **argv, s https://github.com/ruby/ruby/blob/trunk/ruby.c#L1447
 			rb_enc_associate(rb_str_dup(RARRAY_AREF(load_path, i)), lenc));
 	}
     }
+    Init_ext();		/* load statically linked extensions before rubygems */
     if (!(opt->disable & DISABLE_BIT(gems))) {
 	rb_define_module("Gem");
     }

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