naruse	2019-01-18 07:07:55 +0900 (Fri, 18 Jan 2019)

  New Revision: 66852

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

  Log:
    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 <mistydemeo@g...>

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/configure.ac
    branches/ruby_2_6/version.h
Index: ruby_2_6/configure.ac
===================================================================
--- ruby_2_6/configure.ac	(revision 66851)
+++ ruby_2_6/configure.ac	(revision 66852)
@@ -1102,7 +1102,8 @@ AS_IF([test "x$with_jemalloc" != xno],[ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/configure.ac#L1102
     [test x$with_jemalloc = xyes && with_jemalloc=no])
   AC_CHECK_HEADER(jemalloc/jemalloc.h, [
     AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
-  ])
+  ],
+  [test x$with_jemalloc = xyes && with_jemalloc=no])
   AS_IF([test "x$with_jemalloc" != xyes], [
     AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle,
       [AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 66851)
+++ ruby_2_6/version.h	(revision 66852)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.0"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 20
+#define RUBY_PATCHLEVEL 21
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66851)
+++ ruby_2_6	(revision 66852)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66779

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