nagachika	2018-03-02 21:59:11 +0900 (Fri, 02 Mar 2018)

  New Revision: 62636

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

  Log:
    merge revision(s) 59454,59954: [Backport #14118]
    
    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_4/
  Modified files:
    branches/ruby_2_4/Makefile.in
    branches/ruby_2_4/configure.in
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 62635)
+++ ruby_2_4/version.h	(revision 62636)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.4"
 #define RUBY_RELEASE_DATE "2018-03-02"
-#define RUBY_PATCHLEVEL 241
+#define RUBY_PATCHLEVEL 242
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/configure.in
===================================================================
--- ruby_2_4/configure.in	(revision 62635)
+++ ruby_2_4/configure.in	(revision 62636)
@@ -569,17 +569,23 @@ AS_CASE(["$target_cpu-$target_os"], [[i[ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/configure.in#L569
 		 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 D option], [rb_cv_ar_D_option], [
+AC_CACHE_CHECK([for $AR flags], [rb_cv_arflags], [
     AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a],
-	[rb_cv_ar_D_option=yes], [rb_cv_ar_D_option=no])
+	[rb_cv_arflags=rcD], [rb_cv_arflags=rcu])
 ])
-AS_IF([test "$rb_cv_ar_D_option" = yes], [ARFLAGS='rcD '], [ARFLAGS='rcu '])
-AC_SUBST(ARFLAGS)
+AC_SUBST(ARFLAGS, ["$rb_cv_arflags "])
 
 AC_CHECK_TOOL(AS, as)
 ASFLAGS=$ASFLAGS
Index: ruby_2_4/Makefile.in
===================================================================
--- ruby_2_4/Makefile.in	(revision 62635)
+++ ruby_2_4/Makefile.in	(revision 62636)
@@ -164,7 +164,7 @@ RMDIRS        = @RMDIRS@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/Makefile.in#L164
 RMALL         = @RMALL@
 NM            = @NM@
 AR            = @AR@
-ARFLAGS       = @ARFLAGS@
+ARFLAGS       = @ARFLAGS@$(empty)
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 62635)
+++ ruby_2_4	(revision 62636)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r59454,59954

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