git: b572edb09c4d - releng/13.1 - libarchive: fix zstd compression support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 10 Apr 2022 23:55:01 UTC
The branch releng/13.1 has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=b572edb09c4da2949b20a62e98cbf2e6df88e7e1
commit b572edb09c4da2949b20a62e98cbf2e6df88e7e1
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2022-04-08 08:09:32 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2022-04-10 23:52:50 +0000
libarchive: fix zstd compression support
The commit 833a452e9 introduced a change that detached
the zstd compression (not decompression) support from base build.
Reported by: kevans
Approved by: re (delphij)
(cherry picked from commit 7f815d4f128f063c1bac361c8f26b52ab7df1e6c)
(cherry picked from commit 3caf7dd45d08a5b7b7fafe39e7aae7d7f8d1a684)
---
lib/libarchive/Makefile.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc
index 6e5017d6621a..409e1972191d 100644
--- a/lib/libarchive/Makefile.inc
+++ b/lib/libarchive/Makefile.inc
@@ -4,7 +4,8 @@
# between structures such as archive_md5_ctx, etc.
LIBADD= z bz2 lzma bsdxml zstd
-CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1
+CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 \
+ -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_LIBZSTD_COMPRESSOR=1
CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
.if ${MK_OPENSSL} != "no"