Skip to content

Commit 30152d4

Browse files
committed
Async IO decompression: fix meson compilation
1 parent f0e01a5 commit 30152d4

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

build/meson/programs/meson.build

+18-5
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,24 @@ zstd_programs_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'),
2020
join_paths(zstd_rootdir, 'programs/dibio.c'),
2121
join_paths(zstd_rootdir, 'programs/zstdcli_trace.c'),
2222
# needed due to use of private symbol + -fvisibility=hidden
23-
join_paths(zstd_rootdir, 'lib/common/xxhash.c')]
23+
join_paths(zstd_rootdir, 'lib/common/xxhash.c'),
24+
join_paths(zstd_rootdir, 'lib/common/pool.c'),
25+
join_paths(zstd_rootdir, 'lib/common/zstd_common.c'),
26+
join_paths(zstd_rootdir, 'lib/common/error_private.c')]
2427

28+
zstd_deps = [ libzstd_dep ]
2529
zstd_c_args = libzstd_debug_cflags
30+
31+
zstd_frugal_deps = [ libzstd_dep ]
32+
zstd_frugal_c_args = [ '-DZSTD_NOBENCH', '-DZSTD_NODICT', '-DZSTD_NOTRACE' ]
33+
2634
if use_multi_thread
35+
zstd_deps += [ thread_dep ]
2736
zstd_c_args += [ '-DZSTD_MULTITHREAD' ]
37+
zstd_frugal_deps += [ thread_dep ]
38+
zstd_frugal_c_args += [ '-DZSTD_MULTITHREAD' ]
2839
endif
2940

30-
zstd_deps = [ libzstd_dep ]
3141
if use_zlib
3242
zstd_deps += [ zlib_dep ]
3343
zstd_c_args += [ '-DZSTD_GZCOMPRESS', '-DZSTD_GZDECOMPRESS' ]
@@ -69,14 +79,17 @@ zstd = executable('zstd',
6979
zstd_frugal_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'),
7080
join_paths(zstd_rootdir, 'programs/timefn.c'),
7181
join_paths(zstd_rootdir, 'programs/util.c'),
72-
join_paths(zstd_rootdir, 'programs/fileio.c')]
82+
join_paths(zstd_rootdir, 'programs/fileio.c'),
83+
join_paths(zstd_rootdir, 'lib/common/pool.c'),
84+
join_paths(zstd_rootdir, 'lib/common/zstd_common.c'),
85+
join_paths(zstd_rootdir, 'lib/common/error_private.c')]
7386

7487
# Minimal target, with only zstd compression and decompression.
7588
# No bench. No legacy.
7689
executable('zstd-frugal',
7790
zstd_frugal_sources,
78-
dependencies: libzstd_dep,
79-
c_args: [ '-DZSTD_NOBENCH', '-DZSTD_NODICT', '-DZSTD_NOTRACE' ],
91+
dependencies: zstd_frugal_deps,
92+
c_args: zstd_frugal_c_args,
8093
install: true)
8194

8295
install_data(join_paths(zstd_rootdir, 'programs/zstdgrep'),

0 commit comments

Comments
 (0)