summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-19 03:55:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-19 03:55:38 +0000
commitb51081308b5ae6d716d7ebe764d17557d1491563 (patch)
tree215dd4ea8bfe128bf32dbc9a531b26d6034cd253
parent24620aaf1ce8f3b4c9214d28ea5af581d54586be (diff)
merge revision(s) 35395:
* ext/-test-/win32/dln/extconf.rb: need import library for ordinal entry even on mingw. [ruby-core:44441][Bug #6320] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/-test-/win32/dln/extconf.rb8
-rw-r--r--version.h6
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d7452a56e5..fd214841ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 19 12:55:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* configure.in (DOT, DOXYGEN): use AC_CHECK_PROGS instead of
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
index 2e52acc1d0..cc94a67549 100644
--- a/ext/-test-/win32/dln/extconf.rb
+++ b/ext/-test-/win32/dln/extconf.rb
@@ -5,14 +5,18 @@ if $mingw or $mswin
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"
diff --git a/version.h b/version.h
index e1273a8fe8..44711e6ed0 100644
--- a/version.h
+++ b/version.h
@@ -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"