nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mark openbsd-malloc as deprecated

Browse Source
This commit is contained in:
Nick Mathewson 2018-08-03 07:38:47 -04:00
parent bb1f294232
commit 5597ddc360
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket20424
View File

@ -1,5 +1,5 @@
o Minor features (compilation): o Minor features (compilation):
- Tor's configure script now supports a --with-malloc= option to select - Tor's configure script now supports a --with-malloc= option to select
your malloc implementation. Supported options are "tcmalloc", your malloc implementation. Supported options are "tcmalloc",
"jemalloc", "openbsd", and "system" (the default). Addresses part of "jemalloc", "openbsd" (deprecated), and "system" (the default).
ticket 20424. Based on a patch from Alex Xu. Addresses part of ticket 20424. Based on a patch from Alex Xu.

5
configure.ac
View File

@ -22,7 +22,7 @@ AC_CANONICAL_HOST
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AC_ARG_ENABLE(openbsd-malloc, AC_ARG_ENABLE(openbsd-malloc,
AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only])) AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc]))
AC_ARG_ENABLE(static-openssl, AC_ARG_ENABLE(static-openssl,
AS_HELP_STRING(--enable-static-openssl, [link against a static openssl library. Requires --with-openssl-dir])) AS_HELP_STRING(--enable-static-openssl, [link against a static openssl library. Requires --with-openssl-dir]))
AC_ARG_ENABLE(static-libevent, AC_ARG_ENABLE(static-libevent,
@ -1788,7 +1788,7 @@ if test "$tor_cv_uint8_uchar" = "no"; then
fi fi
AC_ARG_WITH(tcmalloc, AC_ARG_WITH(tcmalloc,
AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library]), AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library. Deprecated; see --with-malloc]),
[ tcmalloc=yes ], [ tcmalloc=no ]) [ tcmalloc=yes ], [ tcmalloc=no ])
default_malloc=system default_malloc=system
@ -1839,6 +1839,7 @@ AS_CASE([$malloc],
], ],
[openbsd], [ [openbsd], [
AC_WARN([The openbsd malloc port is deprecated in Tor 0.3.5 and will be removed in a future version.])
enable_openbsd_malloc=yes enable_openbsd_malloc=yes
], ],