diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2023-08-23 23:44:47 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2023-10-09 20:14:07 +0200 |
| commit | 3914abf76e3d1e65c41f7483ba76bc61f5057670 (patch) | |
| tree | 70d47e18692870fc42f4446d25180729f2886f0b | |
| parent | 3c6516330f6452db9463f954d04710cf7effed6b (diff) | |
| download | ffmpeg-3914abf76e3d1e65c41f7483ba76bc61f5057670.tar.gz | |
configure: fix --custom-allocator
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.
| -rwxr-xr-x | configure | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -6358,16 +6358,26 @@ 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 + add_extralibs "$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 |