ruby-changes:46498
From: nagachika <ko1@a...>
Date: Tue, 9 May 2017 23:09:49 +0900 (JST)
Subject: [ruby-changes:46498] nagachika:r58619 (ruby_2_4): merge revision(s) 58084: [Backport #13361]
nagachika 2017-05-09 23:09:44 +0900 (Tue, 09 May 2017) New Revision: 58619 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58619 Log: 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] Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/configure.in branches/ruby_2_4/version.h Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 58618) +++ ruby_2_4/version.h (revision 58619) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #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" Index: ruby_2_4/configure.in =================================================================== --- ruby_2_4/configure.in (revision 58618) +++ ruby_2_4/configure.in (revision 58619) @@ -1100,6 +1100,12 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_4/configure.in#L1100 ], [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 Index: ruby_2_4 =================================================================== --- ruby_2_4 (revision 58618) +++ ruby_2_4 (revision 58619) Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r58084 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/