ruby-changes:50026
From: usa <ko1@a...>
Date: Wed, 31 Jan 2018 22:58:18 +0900 (JST)
Subject: [ruby-changes:50026] usa:r62144 (ruby_2_3): merge revision(s) 60182: [Backport #14009]
usa 2018-01-31 22:58:12 +0900 (Wed, 31 Jan 2018) New Revision: 62144 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62144 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_3/ Modified files: branches/ruby_2_3/ChangeLog branches/ruby_2_3/configure.in branches/ruby_2_3/version.h Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 62143) +++ ruby_2_3/version.h (revision 62144) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-01-31" -#define RUBY_PATCHLEVEL 405 +#define RUBY_PATCHLEVEL 406 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 1 Index: ruby_2_3/configure.in =================================================================== --- ruby_2_3/configure.in (revision 62143) +++ ruby_2_3/configure.in (revision 62144) @@ -3987,8 +3987,8 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_3/configure.in#L3987 ], [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_3/ChangeLog =================================================================== --- ruby_2_3/ChangeLog (revision 62143) +++ ruby_2_3/ChangeLog (revision 62144) @@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1 +Wed Jan 31 22:57:42 2018 Nobuyoshi Nakada <nobu@r...> + + configure.in: link Foundation framework + + * configure.in (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] + Wed Jan 31 22:51:59 2018 Pete Higgins <pete@p...> * thread_sync.c (Init_thread_sync): Remove confusing doc comments, Index: ruby_2_3 =================================================================== --- ruby_2_3 (revision 62143) +++ ruby_2_3 (revision 62144) Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r60182 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/