2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00

Merge branch '3634-dont-enforce-jemalloc-on-NetBSD' into 'main'

Don't enforce jemalloc on NetBSD

Closes #3634

See merge request isc-projects/bind9!7004
This commit is contained in:
Ondřej Surý 2022-10-31 15:14:37 +00:00
commit 16be88d14f
2 changed files with 4 additions and 3 deletions

View File

@ -1,3 +1,5 @@
6007. [cleanup] Don't enforce the jemalloc use on NetBSD. [GL #3634]
6006. [cleanup] The zone dumping was using isc_task API to launch
the zonedump on the offloaded threadpool. Remove
the task and launch the offloaded work directly.

View File

@ -1393,7 +1393,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],
@ -1413,8 +1413,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"])