diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-04-10 19:31:31 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-04-10 22:48:34 +0200 |
| commit | cb1763e48401d77100630184e56908c287e70109 (patch) | |
| tree | 1ad820dd12e161a6131841629362bb77b36d65c5 /tests | |
| parent | 97e4ae237c760144c912530122d3899de850e23f (diff) | |
Remove builtin copy of zlib
On GNU/Linux, *BSD or MacOS we can simply use the system default
library. The copy was primarily only there for the Windows build.
The build script for Windows has now been adapted to download and
compile a shared library from a tarball.
This removes a huge chunk of code from the git tree as well as
the release tarballs. Additionally it gets rid of iffy things like
removing the Zlib copyright/version strings, so the libsquashfs DLL
doesn't export it.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libfstream/Makemodule.am | 10 | ||||
| -rw-r--r-- | tests/pack_dir_root.txt.ref | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/tests/libfstream/Makemodule.am b/tests/libfstream/Makemodule.am index 0eb7a3e..57a98bc 100644 --- a/tests/libfstream/Makemodule.am +++ b/tests/libfstream/Makemodule.am @@ -38,16 +38,6 @@ test_xfrm_zstd2_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) test_xfrm_zstd2_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) test_xfrm_zstd2_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_ZSTD2=1 -if WITH_OWN_ZLIB -test_xfrm_bzip2_LDADD += libz.la -test_xfrm_bzip22_LDADD += libz.la -test_xfrm_xz_LDADD += libz.la -test_xfrm_xz2_LDADD += libz.la -test_xfrm_gzip_LDADD += libz.la -test_xfrm_zstd_LDADD += libz.la -test_xfrm_zstd2_LDADD += libz.la -endif - if BUILD_TOOLS check_PROGRAMS += test_get_line TESTS += test_get_line diff --git a/tests/pack_dir_root.txt.ref b/tests/pack_dir_root.txt.ref index 1fe4c30..1a64b2a 100644 --- a/tests/pack_dir_root.txt.ref +++ b/tests/pack_dir_root.txt.ref @@ -7,5 +7,4 @@ 0/0 6k musl.txt 0/0 1k xxhash.txt 0/0 768 xz.txt -0/0 983 zlib.txt 0/0 1k zstd.txt |