nagachika	2015-10-27 23:50:55 +0900 (Tue, 27 Oct 2015)

  New Revision: 52307

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52307

  Log:
    merge revision(s) 52124: [Backport #11591]
    
    * configure.in: check for libunwind.h, which is not available in
      very old OS X SDK.  [ruby-core:71080] [Bug #11591]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm_dump.c
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 52306)
+++ ruby_2_2/configure.in	(revision 52307)
@@ -3095,6 +3095,7 @@ AS_CASE(["$target_cpu-$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L3095
     AC_CHECK_HEADERS([execinfo.h])
     if test "x$ac_cv_header_execinfo_h" = xyes; then
 	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_HEADERS([libunwind.h])
     fi],
 [*-freebsd*|x86_64-netbsd*], [
     AC_CHECK_HEADERS([execinfo.h])
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52306)
+++ ruby_2_2/ChangeLog	(revision 52307)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Oct 27 23:38:26 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: check for libunwind.h, which is not available in
+	  very old OS X SDK.  [ruby-core:71080] [Bug #11591]
+
 Tue Oct 27 23:32:51 2015  Masatoshi SEKI  <m_seki@m...>
 
 	* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52306)
+++ ruby_2_2/version.h	(revision 52307)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-10-27"
-#define RUBY_PATCHLEVEL 181
+#define RUBY_PATCHLEVEL 182
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 10
Index: ruby_2_2/vm_dump.c
===================================================================
--- ruby_2_2/vm_dump.c	(revision 52306)
+++ ruby_2_2/vm_dump.c	(revision 52307)
@@ -436,7 +436,7 @@ rb_vmdebug_thread_dump_state(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_dump.c#L436
 # ifdef HAVE_LIBUNWIND
 #  undef backtrace
 #  define backtrace unw_backtrace
-# elif defined(__APPLE__) && defined(__x86_64__)
+# elif defined(__APPLE__) && defined(__x86_64__) && defined(HAVE_LIBUNWIND_H)
 #  define UNW_LOCAL_ONLY
 #  include <libunwind.h>
 #  undef backtrace

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52124


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/