[前][次][番号順一覧][スレッド一覧]

ruby-changes:70093

From: Nobuyoshi <ko1@a...>
Date: Tue, 7 Dec 2021 17:38:37 +0900 (JST)
Subject: [ruby-changes:70093] ec878dac90 (master): Move -ljemalloc to DLDLIBS [Bug #18391]

https://git.ruby-lang.org/ruby.git/commit/?id=ec878dac90

From ec878dac90df0ca5f39e72261b8d4e2898486a93 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 7 Dec 2021 12:32:02 +0900
Subject: Move -ljemalloc to DLDLIBS [Bug #18391]

Set the alternative memory management library only as a platform
specific library, without other libraries.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f7c0d5477f..7177d5bb8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1363,6 +1363,7 @@ AS_IF([test "x$with_jemalloc" != xno],[ https://github.com/ruby/ruby/blob/trunk/configure.ac#L1363
   [-l*], [
     set dummy $with_jemalloc
     LIBS="$2 $LIBS"
+    DLDLIBS="$2${DLDLIBS:+ $DLDLIBS}" # probably needed also in extension libraries
   ])
   AS_CASE(["$with_jemalloc"],
   [*" with mangle"], [
@@ -3353,7 +3354,7 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L3354
     : ${DLDLIBS=""}
     ],
   [
-    DLDLIBS="$DLDLIBS -lc"
+    DLDLIBS="${DLDLIBS:+$DLDLIBS }-lc"
     ])
 
 AC_ARG_ENABLE(multiarch,
@@ -3898,7 +3899,6 @@ AS_IF([test -n "${LIBS}"], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3899
     MAINFLAGS=`echo " $MAINLIBS " | sed "s|$libspat"'||;s/^ *//;s/ *$//'`
 ])
 LIBRUBYARG_STATIC="${LIBRUBYARG_STATIC} \$(MAINLIBS)"
-LIBRUBYARG_SHARED="${LIBRUBYARG_SHARED} \$(MAINLIBS)"
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
 test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
 AS_IF([test -n "${cflags+set}"], [
-- 
cgit v1.2.1


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

[前][次][番号順一覧][スレッド一覧]