commit ab79474e9e9f1556be8b4f742c5a9b4ecba589d8 Author: Kyle Evans Date: Thu Apr 7 22:07:56 2022 -0500 libarchive: catch up to config preproc change for libzstd Previous versions used HAVE_LIBZSTD, but libarchive has switched to HAVE_LIBZSTD_COMPRESSOR. This resulted in libarchive wanting to shell out for zstd support, breaking pkg's zstd support as it wasn't expecting the resulting ARCHIVE_WARN. Fixes: 833a452e9f08 ("libarchive: import changes from upstream") diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc index 6e5017d6621..420b40ab514 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_COMPRESSOR=1 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" .if ${MK_OPENSSL} != "no"