The custom-allocator logic has been completely defunct since a while, since nothing depends on those targets, they never get used. This updates jemalloc to pkg-config, adds the fallback option for potential arbitrary allocators, and finally actually adds the libraries to LDFLAGS. --- configure | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/configure b/configure index c1e592729a..de00bd14e6 100755 --- a/configure +++ b/configure @@ -6369,16 +6369,28 @@ if enabled float16; then fi case "$custom_allocator" in + "") + ;; jemalloc) - # jemalloc by default does not use a prefix - require libjemalloc jemalloc/jemalloc.h malloc -ljemalloc + test -n "$malloc_prefix" || + malloc_prefix=$($pkg_config --variable=jemalloc_prefix $pkg_config_flags jemalloc 2>/dev/null) + require_pkg_config custom_allocator jemalloc jemalloc/jemalloc.h ${malloc_prefix}malloc ;; tcmalloc) - require_pkg_config libtcmalloc libtcmalloc gperftools/tcmalloc.h tc_malloc + require_pkg_config custom_allocator libtcmalloc gperftools/tcmalloc.h tc_malloc malloc_prefix=tc_ ;; + *) + require_pkg_config custom_allocator "$custom_allocator" stdlib.h malloc + ;; esac +if test -n "$custom_allocator"; then + # this library import has to happen as far "left" on the linker commandline as possible, + # hence add it directly to LDFLAGS. + add_ldflags "$custom_allocator_extralibs" +fi + check_func_headers malloc.h _aligned_malloc && enable aligned_malloc check_func ${malloc_prefix}memalign && enable memalign check_func ${malloc_prefix}posix_memalign && enable posix_memalign -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".