kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

configure.in: fix jemalloc option

Browse source 
* configure.in (jemalloc): fix option argument, should use
  `$withval` but not `yes` always.  [ruby-core:66994] [Bug #10625]
* configure.in (jemalloc): defer adding the liner option to get
  rid of linking contest against jemalloc, so that it works
  without runtime dynamic load path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-20 23:35:33 +00:00
parent fa9f7c2557
commit 65cc2e8374
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Sun Dec 21 08:35:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (jemalloc): fix option argument, should use
`$withval` but not `yes` always. [ruby-core:66994] [Bug #10625]
* configure.in (jemalloc): defer adding the liner option to get
rid of linking contest against jemalloc, so that it works
without runtime dynamic load path.
Sat Dec 20 17:49:03 2014 Tanaka Akira <akr@fsij.org>
* lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.

6
configure.in
View file

@ -1204,7 +1204,7 @@ AS_IF([test "x$with_gmp" != xno],
AC_ARG_WITH([jemalloc],
[AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
[with_jemalloc=yes], [with_jemalloc=no])
[with_jemalloc=$withval], [with_jemalloc=no])
AS_IF([test "x$with_jemalloc" = xyes],[
AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no])
AC_CHECK_HEADER(jemalloc/jemalloc.h, [
@ -1225,7 +1225,6 @@ AS_IF([test "x$with_jemalloc" = xyes],[
AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
AC_DEFINE(JEMALLOC_MANGLE)
with_jemalloc=yes
LIBS="-ljemalloc $LIBS"
])
AS_IF([test "x$with_jemalloc" = xyes],
[
@ -3769,6 +3768,9 @@ AS_CASE(["$target_os"],
AS_CASE(["$with_gmp: $SOLIBS "], [no:* | *' -lgmp '*|*' $(LIBS) '*], [],
[SOLIBS="-lgmp $SOLIBS"])
AS_CASE(["$with_jemalloc: $LIBS "], [no:* | *' -ljemalloc '*], [],
[LIBS="-ljemalloc $LIBS"])
MINIOBJS="$MINIDLNOBJ"
AS_CASE(["$THREAD_MODEL"],