Module Name: src
Committed By: martin
Date: Fri Nov 1 10:08:13 UTC 2024
Modified Files:
src/external/bsd/libarchive/include [netbsd-10]: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive [netbsd-10]: Makefile
Log Message:
Fix sync-to-current with too-new-current by backing out the following
revisisions, requested by rin in ticket #991:
external/bsd/libarchive/include/config_netbsd.h rev 1.15 (-> 1.14)
external/bsd/libarchive/lib/libarchive/Makefile rev 1.18 (-> 1.17)
Do not enable zstd support on this branch (yet).
To generate a diff of this commit:
cvs rdiff -u -r1.12.6.1 -r1.12.6.2 \
src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 \
src/external/bsd/libarchive/lib/libarchive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/include/config_netbsd.h
diff -u src/external/bsd/libarchive/include/config_netbsd.h:1.12.6.1 src/external/bsd/libarchive/include/config_netbsd.h:1.12.6.2
--- src/external/bsd/libarchive/include/config_netbsd.h:1.12.6.1 Thu Oct 31 18:40:32 2024
+++ src/external/bsd/libarchive/include/config_netbsd.h Fri Nov 1 10:08:13 2024
@@ -699,7 +699,7 @@
/* #undef HAVE_LIBXML_XMLWRITER_H */
/* Define to 1 if you have the `zstd' library (-lzstd). */
-#define HAVE_LIBZSTD 1
+/* #undef HAVE_LIBZSTD */
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@@ -1255,11 +1255,11 @@
#define HAVE_ZLIB_H 1
/* Define to 1 if you have the <zstd.h> header file. */
-#define HAVE_ZSTD_H 1
+/* #undef HAVE_ZSTD_H */
/* Define to 1 if you have the `zstd' library (-lzstd) with compression
support. */
-#define HAVE_ZSTD_compressStream 1
+/* #undef HAVE_ZSTD_compressStream */
/* Define to 1 if you have the `_fseeki64' function. */
/* #undef HAVE__FSEEKI64 */
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.14.2.2 src/external/bsd/libarchive/lib/libarchive/Makefile:1.14.2.3
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.14.2.2 Thu Oct 31 18:40:32 2024
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Fri Nov 1 10:08:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14.2.2 2024/10/31 18:40:32 martin Exp $
+# $NetBSD: Makefile,v 1.14.2.3 2024/11/01 10:08:13 martin Exp $
.include <bsd.init.mk>
@@ -10,7 +10,6 @@ LIB= archive
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 \
crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
- zstd ${NETBSDSRCDIR}/external/bsd/zstd/lib \
lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib \
z ${NETBSDSRCDIR}/lib/libz
