usa	2018-03-18 23:15:27 +0900 (Sun, 18 Mar 2018)

  New Revision: 62809

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62809

  Log:
    merge revision(s) 53798,59454,59954: [Backport #14118]
    * configure.in (ARFLAGS): check if deterministic mode flag is
      effective, which is on by default on Ubuntu.
    
    
    configure.in: use libtool
    
    * configure.in: use libtool on macOS to suppress a warning against
      debug_counter.o, which has no symbols unless USE_DEBUG_COUNTER
      is set to non-zero.
    
    configure.in: use newer libtool only

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/Makefile.in
    branches/ruby_2_3/configure.in
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62808)
+++ ruby_2_3/ChangeLog	(revision 62809)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun Mar 18 23:11:29 2018  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (ARFLAGS): check if deterministic mode flag is
+	  effective, which is on by default on Ubuntu.
+
+	* configure.in: use libtool on macOS to suppress a warning against
+	  debug_counter.o, which has no symbols unless USE_DEBUG_COUNTER is
+	  set to non-zero.
+
+	* configure.in: use newer libtool only
+
 Sat Feb 17 01:21:00 2018  SHIBATA Hiroshi  <hsbt@r...>
 
 	Merge RubyGems 2.7.6 from upstream.
Index: ruby_2_3/configure.in
===================================================================
--- ruby_2_3/configure.in	(revision 62808)
+++ ruby_2_3/configure.in	(revision 62809)
@@ -556,11 +556,23 @@ AS_CASE(["$target_cpu-$target_os"], [[i[ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/configure.in#L556
 		 CFLAGS="$save_CFLAGS"
 	 fi])
 
+AS_CASE(["$target_os"], [darwin*], [
+if libtool 2>&1 | grep no_warning_for_no_symbols > /dev/null; then
+  ac_cv_prog_ac_ct_RANLIB=:
+  ac_cv_prog_ac_ct_AR='libtool -static'
+  rb_cv_arflags='-no_warning_for_no_symbols -o'
+fi
+])
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(AR, ar)
 if test -z "$AR"; then
   AC_CHECK_PROGS(AR, aal, ar)
 fi
+AC_CACHE_CHECK([for $AR flags], [rb_cv_arflags], [
+    AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a],
+	[rb_cv_arflags=rcD], [rb_cv_arflags=rcu])
+])
+AC_SUBST(ARFLAGS, ["$rb_cv_arflags "])
 
 AC_CHECK_TOOL(AS, as)
 ASFLAGS=$ASFLAGS
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62808)
+++ ruby_2_3/version.h	(revision 62809)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-03-18"
-#define RUBY_PATCHLEVEL 410
+#define RUBY_PATCHLEVEL 411
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_3/Makefile.in
===================================================================
--- ruby_2_3/Makefile.in	(revision 62808)
+++ ruby_2_3/Makefile.in	(revision 62809)
@@ -163,7 +163,7 @@ RMDIRS        = @RMDIRS@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/Makefile.in#L163
 RMALL         = @RMALL@
 NM            = @NM@
 AR            = @AR@
-ARFLAGS       = rcu
+ARFLAGS       = @ARFLAGS@$(empty)
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62808)
+++ ruby_2_3	(revision 62809)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r53798,59454

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