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

ruby-changes:66198

From: John <ko1@a...>
Date: Fri, 14 May 2021 00:14:50 +0900 (JST)
Subject: [ruby-changes:66198] 0aa4ca1477 (master): Fix compilation with jemalloc on macos

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

From 0aa4ca1477e76c7ea0b5d76b4afbc226297dd874 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@h...>
Date: Wed, 12 May 2021 14:17:43 -0700
Subject: Fix compilation with jemalloc on macos

On darwin we avoid including sys/user.h to avoid a conflict. Previously
we still ended up with PAGE_SIZE being defined because the headers for
system malloc define it. However, when compiling with jemalloc nothing
would define PAGE_SIZE.

This commit changes configure.ac so that we never use the PAGE_SIZE
constant on darwin and to always use the sysconf fallback.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a1a0872..ac737f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2733,7 +2733,7 @@ main(int argc, char *argv[]) https://github.com/ruby/ruby/blob/trunk/configure.ac#L2733
 ])
 
 AS_CASE([$target_os],
-    [darwin*], [ac_cv_header_sys_user_h=yes], dnl LIST_HEAD conflicts with sys/queue.h
+    [darwin*], [ac_cv_header_sys_user_h=no], dnl LIST_HEAD conflicts with sys/queue.h
     [AC_CHECK_HEADERS([sys/user.h])]
 )
 AS_IF([test "x$ac_cv_func_mmap:$ac_cv_header_sys_user_h" = xyes:yes], [
-- 
cgit v1.1


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

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