ruby-changes:49243
From: nagachika <ko1@a...>
Date: Wed, 20 Dec 2017 20:55:05 +0900 (JST)
Subject: [ruby-changes:49243] nagachika:r61358 (ruby_2_4): merge revision(s) 60182: [Backport #14009]
nagachika 2017-12-20 20:54:58 +0900 (Wed, 20 Dec 2017) New Revision: 61358 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61358 Log: merge revision(s) 60182: [Backport #14009] configure.ac: link Foundation framework * configure.ac (XLDFLAGS): link against Foundation framework and let __NSPlaceholderDictionary initialize, to get rid of crash after fork on macOS High Sierra. [ruby-core:83239] [Bug #14009] 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 61357) +++ ruby_2_4/version.h (revision 61358) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.4" -#define RUBY_RELEASE_DATE "2017-12-19" -#define RUBY_PATCHLEVEL 207 +#define RUBY_RELEASE_DATE "2017-12-20" +#define RUBY_PATCHLEVEL 208 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" Index: ruby_2_4/configure.in =================================================================== --- ruby_2_4/configure.in (revision 61357) +++ ruby_2_4/configure.in (revision 61358) @@ -4144,8 +4144,8 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_4/configure.in#L4144 ], [darwin*], [ RUBY_APPEND_OPTION(CFLAGS, -pipe) - RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation]) - RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework CoreFoundation]) + RUBY_APPEND_OPTION(XLDFLAGS, [-framework Foundation]) + RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Foundation]) ], [osf*], [ if test "$GCC" != "yes" ; then Index: ruby_2_4 =================================================================== --- ruby_2_4 (revision 61357) +++ ruby_2_4 (revision 61358) Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r60182 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/