upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 04:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Don't enforce jemalloc on NetBSD [v9.18]

See merge request isc-projects/bind9!7005
This commit is contained in:
Ondřej Surý 2022-10-31 15:24:25 +00:00
commit c8ff8108e7
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -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]

5
configure.ac
View file

@ -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"])