nobu	2012-04-19 12:55:38 +0900 (Thu, 19 Apr 2012)

  New Revision: 35398

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

  Log:
    merge revision(s) 35395:
    
    * ext/-test-/win32/dln/extconf.rb: need import library for ordinal
      entry even on mingw.  [ruby-core:44441][Bug #6320]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/-test-/win32/dln/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35397)
+++ ruby_1_9_3/ChangeLog	(revision 35398)
@@ -1,3 +1,8 @@
+Thu Apr 19 12:55:31 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/-test-/win32/dln/extconf.rb: need import library for ordinal
+	  entry even on mingw.  [ruby-core:44441][Bug #6320]
+
 Wed Apr 18 23:08:58 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (DOT, DOXYGEN): use AC_CHECK_PROGS instead of
Index: ruby_1_9_3/ext/-test-/win32/dln/extconf.rb
===================================================================
--- ruby_1_9_3/ext/-test-/win32/dln/extconf.rb	(revision 35397)
+++ ruby_1_9_3/ext/-test-/win32/dln/extconf.rb	(revision 35398)
@@ -5,14 +5,18 @@
 
   create_makefile("-test-/win32/dln")
   m = File.read("Makefile")
-  m.sub!(/^OBJS =.*/) {$&+" dlntest.#{$LIBEXT}"}
+  dlntestlib = "dlntest.#{$LIBEXT}"
+  m.sub!(/^OBJS =.*/) {"#{$&} #{dlntestlib}"}
   open("Makefile", "wb") do |mf|
     mf.puts m, "\n"
     sodir = $extout ? "$(RUBYARCHDIR)/" : ''
-    mf.print "#{sodir}$(DLLIB): $(topdir)/dlntest.dll"
+    mf.print "#{sodir}$(DLLIB): #{dlntestlib}"
     mf.puts
+    mf.puts "#{dlntestlib}: $(topdir)/dlntest.dll"
+    mf.puts
     if $mingw
       mf.puts "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def"
+      mf.puts "$(topdir)/dlntest.dll: DLDFLAGS += -Wl,--out-implib,#{dlntestlib}"
     end
     mf.puts depend_rules("$(topdir)/dlntest.dll: libdlntest.o libdlntest.def")
     mf.puts "\t$(ECHO) linking shared-object $(@F)\n"
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35397)
+++ ruby_1_9_3/version.h	(revision 35398)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 190
+#define RUBY_PATCHLEVEL 191
 
-#define RUBY_RELEASE_DATE "2012-04-18"
+#define RUBY_RELEASE_DATE "2012-04-19"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 

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