nagachika	2013-03-11 00:54:58 +0900 (Mon, 11 Mar 2013)

  New Revision: 39704

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

  Log:
    merge revision(s) 39489,39490: [Backport #7950]
    
    * 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 directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/enc/Makefile.in
    branches/ruby_2_0_0/enc/depend
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39703)
+++ ruby_2_0_0/ChangeLog	(revision 39704)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 11 00:54:30 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 Mar 11 00:50:21 2013  Zachary Scott  <zachary@z...>
 
 	* thread.c: Document Thread::new, clean up ::fork and mention calling
Index: ruby_2_0_0/enc/Makefile.in
===================================================================
--- ruby_2_0_0/enc/Makefile.in	(revision 39703)
+++ ruby_2_0_0/enc/Makefile.in	(revision 39704)
@@ -35,6 +35,7 @@ LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/enc/Makefile.in#L35
 empty =
 AR = @AR@
 CC = @CC@
+ARFLAGS = @ARFLAGS@$(empty)
 RANLIB = @RANLIB@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
Index: ruby_2_0_0/enc/depend
===================================================================
--- ruby_2_0_0/enc/depend	(revision 39703)
+++ ruby_2_0_0/enc/depend	(revision 39704)
@@ -10,6 +10,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/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/ruby_2_0_0/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)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39703)
+++ ruby_2_0_0/version.h	(revision 39704)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-11"
-#define RUBY_PATCHLEVEL 48
+#define RUBY_PATCHLEVEL 49
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39489-39490


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