diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-24 17:44:40 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-24 17:44:40 +0000 |
| commit | 6ccc9e9f95556ddb8ada02a144ec20e892215c3d (patch) | |
| tree | 8437457d4ba7fb6cfd9650248f5213dcd87181ba | |
| parent | 7b70f0e22ac6a5edce3db3ffe199d61bc8e098bc (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,13 @@ +Mon Apr 25 02:29:07 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * configure.in: add missing -lm for AIX. + +Mon Apr 25 02:29:07 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * 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. + Sun Apr 24 03:05:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.c: cygwin does not use w32_cmdvector, command line can be diff --git a/configure.in b/configure.in index f20871e729..29b63c2401 100644 --- a/configure.in +++ b/configure.in @@ -1214,6 +1214,9 @@ main() 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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.0" -#define RUBY_RELEASE_DATE "2016-04-24" -#define RUBY_PATCHLEVEL 107 +#define RUBY_RELEASE_DATE "2016-04-25" +#define RUBY_PATCHLEVEL 108 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h" |