nobu	2013-02-25 15:47:23 +0900 (Mon, 25 Feb 2013)

  New Revision: 39489

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

  Log:
    depend: fix for static library on mswin
    
    * enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
      output option and the output file name.  [Bug #7950]
    * enc/depend (RANLIB): set default command to do nothing, or make the
      entire line a label on Windows.

  Modified files:
    trunk/ChangeLog
    trunk/enc/Makefile.in
    trunk/enc/depend

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39488)
+++ ChangeLog	(revision 39489)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Feb 25 15:47:18 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
+	  output option and the output file name.  [Bug #7950]
+
+	* enc/depend (RANLIB): set default command to do nothing, or make the
+	  entire line a label on Windows.
+
 Mon Feb 25 14:41:07 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir.
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 39488)
+++ enc/Makefile.in	(revision 39489)
@@ -35,6 +35,7 @@ LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED) https://github.com/ruby/ruby/blob/trunk/enc/Makefile.in#L35
 empty =
 AR = @AR@
 CC = @CC@
+ARFLAGS = @ARFLAGS@$(empty)
 RANLIB = @RANLIB@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
Index: enc/depend
===================================================================
--- enc/depend	(revision 39488)
+++ enc/depend	(revision 39489)
@@ -10,6 +10,8 @@ https://github.com/ruby/ruby/blob/trunk/enc/depend#L10
 % rule_subst = CONFIG["RULE_SUBST"] || "%s"
 % transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
 % transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "%s") % ""
+% CONFIG['ARFLAGS'] = 'rcu ' if CONFIG['ARFLAGS'].empty?
+% CONFIG['RANLIB'] = ':' if CONFIG['RANLIB'].empty?
 % if File::ALT_SEPARATOR
 %   pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
 % else
@@ -63,12 +65,12 @@ libtrans: $(LIBTRANS) https://github.com/ruby/ruby/blob/trunk/enc/depend#L65
 $(LIBENC): $(ENCOBJS)
 	@$(RM) $@
 	$(ECHO) linking statically-linked encoding library $@
-	$(Q) $(AR) <%=CONFIG['ARFLAGS'] || 'rcu' %> $@ $(ENCOBJS)
+	$(Q) $(AR) $(ARFLAGS)$@ $(ENCOBJS)
 	@-$(RANLIB) $@ 2> /dev/null || true
 $(LIBTRANS): $(TRANSOBJS)
 	@$(RM) $@
 	$(ECHO) linking statically-linked transcoder library $@
-	$(Q) $(AR) <%=CONFIG['ARFLAGS'] || 'rcu' %> $@ $(TRANSOBJS)
+	$(Q) $(AR) $(ARFLAGS)$@ $(TRANSOBJS)
 	@-$(RANLIB) $@ 2> /dev/null || true
 
 srcs: $(TRANSCSRCS)

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