From 7e157824d3211b3d7ecff15db03749c2abe74efc Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 13 Mar 2019 00:06:19 +0000 Subject: [PATCH] merge revision(s) 66779: [Backport #15520] configure: refuse to build with jemalloc when header is missing [ruby-core:90964] [Bug #15520] Freom: Misty De Meo git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.ac | 3 ++- version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 90ce91bf7c..8a7cee55b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1319,7 +1319,8 @@ AS_IF([test "x$with_jemalloc" = xyes],[ [AC_DEFINE(HAVE_LIBJEMALLOC, 1)], [with_jemalloc=no]) AC_CHECK_HEADER(jemalloc/jemalloc.h, [ AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, []) - ]) + ], + [test x$with_jemalloc = xyes && with_jemalloc=no]) AS_IF([test "x$with_jemalloc" = xno], [ AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle, [AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1 diff --git a/version.h b/version.h index 56889f8d1c..59c8c918b0 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.4" #define RUBY_RELEASE_DATE "2019-03-13" -#define RUBY_PATCHLEVEL 152 +#define RUBY_PATCHLEVEL 153 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 3