Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Apr 2022 22:47:11 GMT
From:      Martin Matuska <mm@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 3caf7dd45d08 - stable/13 - libarchive: fix zstd compression support
Message-ID:  <202204102247.23AMlB8a016212@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=3caf7dd45d08a5b7b7fafe39e7aae7d7f8d1a684

commit 3caf7dd45d08a5b7b7fafe39e7aae7d7f8d1a684
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2022-04-08 08:09:32 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2022-04-10 22:35:29 +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
    
    (cherry picked from commit 7f815d4f128f063c1bac361c8f26b52ab7df1e6c)
---
 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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204102247.23AMlB8a016212>