nobu	2012-04-19 09:40:00 +0900 (Thu, 19 Apr 2012)

  New Revision: 35395

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

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

  Modified files:
    trunk/ChangeLog
    trunk/ext/-test-/win32/dln/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35394)
+++ ChangeLog	(revision 35395)
@@ -1,3 +1,8 @@
+Thu Apr 19 09:39:57 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]
+
 Thu Apr 19 09:35:15 2012  Eric Hodel  <drbrain@s...>
 
 	* random.c (random_init):  Clarify that the default seed is
Index: ext/-test-/win32/dln/extconf.rb
===================================================================
--- ext/-test-/win32/dln/extconf.rb	(revision 35394)
+++ ext/-test-/win32/dln/extconf.rb	(revision 35395)
@@ -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"

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