diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 14:09:44 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 14:09:44 +0000 |
commit | 3f1737d844e29e707003f66acd3fe75cb96776e5 (patch) | |
tree | 4b1d31f472ec8f0c10d332bb3b00b98d0b3d4bee | |
parent | d86d283fcb35d1442a121b92030884523908a331 (diff) |
merge revision(s) 58084: [Backport #13361]
configure.in: syscall is deprecated on macOS
* configure.in: syscall is no longer supported on macOS since
10.12. [ruby-core:80300] [Bug #13361]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | version.h | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 0c862e87d9..8a6662e06a 100644 --- a/configure.in +++ b/configure.in @@ -1100,6 +1100,12 @@ AS_CASE(["$target_os"], ], [macosx_10_5=yes], [macosx_10_5=no]) AC_MSG_RESULT($macosx_10_5) + AS_IF([test "${target_os@%:@darwin}" -ge 16], [ + ac_cv_func___syscall=no + ac_cv_func_syscall=no + ac_cv_header_sys_syscall_h=no + ac_cv_header_syscall_h=no + ]) if test $macosx_10_5 = yes; then ac_cv_func_getcontext=no ac_cv_func_setcontext=no @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.2" -#define RUBY_RELEASE_DATE "2017-04-22" -#define RUBY_PATCHLEVEL 114 +#define RUBY_RELEASE_DATE "2017-05-09" +#define RUBY_PATCHLEVEL 115 #define RUBY_RELEASE_YEAR 2017 -#define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_MONTH 5 +#define RUBY_RELEASE_DAY 9 #include "ruby/version.h" |