usa	2016-04-26 13:23:06 +0900 (Tue, 26 Apr 2016)

  New Revision: 54771

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

  Log:
    merge revision(s) 54716,54719,54750: [Backport #12314]
    
    * configure.in: don't use the system-provided round(3) on AIX.
      In AIX, round(0.49999999999999994) returns 1.0.
      Use round() in numeric.c instead.
    
    * configure.in: add missing -lm for AIX.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54770)
+++ ruby_2_2/ChangeLog	(revision 54771)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Apr 26 13:22:45 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* configure.in: add missing -lm for AIX.
+
+Tue Apr 26 13:22:45 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* configure.in: don't use the system-provided round(3) on AIX.
+	  In AIX, round(0.49999999999999994) returns 1.0.
+	  Use round() in numeric.c instead.
+
 Tue Apr 26 13:18:59 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c: cygwin does not use w32_cmdvector, command line can be
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54770)
+++ ruby_2_2/version.h	(revision 54771)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 316
+#define RUBY_PATCHLEVEL 317
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 54770)
+++ ruby_2_2/configure.in	(revision 54771)
@@ -1131,6 +1131,9 @@ main() https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L1131
 		ac_cv_func_isinf=yes
 		ac_cv_func_isnan=yes
 		],
+[aix*],[	LIBS="-lm $LIBS"
+		ac_cv_func_round=no
+		],
 [nacl], [
   LIBS="-lm $LIBS"
   if test "${nacl_cv_build_variant}" = "newlib"; then

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54716,54719,54750


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