nobu	2013-03-03 00:04:23 +0900 (Sun, 03 Mar 2013)

  New Revision: 39556

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

  Log:
    mswin: static-linked-ext
    
    * enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile):
      define RUBY_EXPORT for static-linked-ext mswin.  [Bug #7960]

  Modified files:
    trunk/ChangeLog
    trunk/enc/depend
    trunk/lib/mkmf.rb
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39555)
+++ ChangeLog	(revision 39556)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Mar  3 00:04:20 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile):
+	  define RUBY_EXPORT for static-linked-ext mswin.  [Bug #7960]
+
 Sat Mar  2 22:49:47 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/Makefile.sub (EXTOBJS, EXTOBJS, config.h): definitions for
Index: enc/depend
===================================================================
--- enc/depend	(revision 39555)
+++ enc/depend	(revision 39556)
@@ -12,6 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/enc/depend#L12
 % transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "%s") % ""
 % CONFIG['ARFLAGS'] = 'rcu ' if (CONFIG['ARFLAGS'] || "").empty?
 % CONFIG['RANLIB'] = ':' if (CONFIG['RANLIB'] || "").empty?
+% CONFIG['CPPFLAGS'] += " -DRUBY_EXPORT=1" if CONFIG["EXTSTATIC"] == "static"
 % if File::ALT_SEPARATOR
 %   pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
 % else
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 39555)
+++ lib/mkmf.rb	(revision 39556)
@@ -2106,6 +2106,10 @@ RULES https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2106
       $distcleandirs.concat($INSTALLFILES.collect {|files, dir| dir})
     end
 
+    if $extmk and $static
+      $defs << "-DRUBY_EXPORT=1"
+    end
+
     if $extmk and not $extconf_h
       create_header
     end
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 39555)
+++ win32/Makefile.sub	(revision 39556)
@@ -944,6 +944,7 @@ $(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $ https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L944
 		$(Q) $(LDSHARED_0)
 		$(Q) $(LDSHARED_1)
 		$(Q) $(LDSHARED_2)
+# | findstr -v -c:LNK4049 -c:LNK4217
 
 $(RUBYDEF):	$(LIBRUBY_A) $(PREP)
 		$(ECHO) generating $(@:\=/)

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