summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-28 06:40:22 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-28 06:40:22 +0000
commitb2638c9f19670f9e64366faf647de4e4e6612d2e (patch)
tree9aadfc33a8cafbadf013f05fd1e4dcc2e324d1d7
parentb411090c861fdb3f6155207e27d79b696e42fb0a (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_2@58193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--configure.in6
-rw-r--r--version.h6
3 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 37160ed..4821eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 28 15:39:26 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ configure.in: syscall is deprecated on macOS
+
+ * configure.in: syscall is no longer supported on macOS since 10.12.
+ [Bug #13361]
+
Mon Mar 27 01:41:37 2017 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: improve ICC (Intel C Compiler) support.
diff --git a/configure.in b/configure.in
index fc30522..99fc7d0 100644
--- a/configure.in
+++ b/configure.in
@@ -1026,6 +1026,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
diff --git a/version.h b/version.h
index 23ddc0d..db273b6 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.7"
-#define RUBY_RELEASE_DATE "2017-03-27"
-#define RUBY_PATCHLEVEL 469
+#define RUBY_RELEASE_DATE "2017-03-28"
+#define RUBY_PATCHLEVEL 470
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
#include "ruby/version.h"