From a4341b4338f31791bd2a364a5bed207639a5e4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondr=CC=8Cej=20Sury=CC=81?= Date: Mon, 31 Oct 2022 14:46:30 +0000 Subject: [PATCH 1/2] Don't enforce jemalloc on NetBSD The NetBSD system allocator is in fact based on the jemalloc, but it doesn't export the extended interface, so we can't use that. Remove the jemalloc enforcement for the NetBSD. (cherry picked from commit feea72414b4251ffa67c05e17efe21e9fa28d4ab) --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2a39981d8e..a7bd81d957 100644 --- a/configure.ac +++ b/configure.ac @@ -1335,7 +1335,7 @@ AC_SUBST([CMOCKA_LIBS]) AM_CONDITIONAL([HAVE_CMOCKA], [test "$with_cmocka" = "yes"]) # -# Compile with jemalloc (either provided as package or wired in the system on FreeBSD and NetBSD) +# Compile with jemalloc (either provided as package or wired in the system on FreeBSD) # # [pairwise: --with-jemalloc=detect, --with-jemalloc=yes, --without-jemalloc] AC_ARG_WITH([jemalloc], @@ -1355,8 +1355,7 @@ AS_CASE([$with_jemalloc], AS_IF([test "$with_jemalloc" = "no"], [AS_CASE([$host], - [*-freebsd*],[AC_MSG_ERROR([You cannot compile without jemalloc; jemalloc is the system allocator on FreeBSD])], - [*-netbsd*],[AC_MSG_ERROR([You cannot compile without jemalloc; jemalloc is the system allocator on NetBSD])]) + [*-freebsd*],[AC_MSG_ERROR([You cannot compile without jemalloc; jemalloc is the system allocator on FreeBSD])]) AC_CHECK_FUNCS([malloc_size malloc_usable_size])]) AM_CONDITIONAL([HAVE_JEMALLOC], [test "$with_jemalloc" = "yes"]) From 0cc485faf1e5cf56e9d11244bfa1878929664997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondr=CC=8Cej=20Sury=CC=81?= Date: Mon, 31 Oct 2022 14:48:08 +0000 Subject: [PATCH 2/2] Add CHANGES note for [GL #3634] (cherry picked from commit fdf1e226fd95491c5d5951ee5dbdfee7f12389c8) --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index eedf0ed9dc..c925d35a1a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +6007. [cleanup] Don't enforce the jemalloc use on NetBSD. [GL #3634] + 6003. [bug] Fix an inheritance bug when setting the port on remote servers in configuration. [GL #3627]