diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-27 14:50:55 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-27 14:50:55 +0000 |
commit | 6834de6b5b6e0e9d6c0a5353a84761cae08aa6ad (patch) | |
tree | 74172a822baac6316cd7891b170f8fea388612c3 | |
parent | edb7a6e23969a10e895a1752b2731f6df77a88c6 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm_dump.c | 2 |
4 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Oct 27 23:38:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@mva.biglobe.ne.jp> * test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027] diff --git a/configure.in b/configure.in index 7330df41ad..c6a1019229 100644 --- a/configure.in +++ b/configure.in @@ -3095,6 +3095,7 @@ AS_CASE(["$target_cpu-$target_os"], 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]) @@ -1,6 +1,6 @@ #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 @@ -436,7 +436,7 @@ rb_vmdebug_thread_dump_state(VALUE self) # 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 |