From d28d5e1457d57b692d43bf39a76fef9f93171b08 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Mon, 26 Nov 2018 21:45:27 +0000 Subject: [PATCH] libarchive configuration changes - move HAVE_BZLIB_H, HAVE_LIBLZMA and HAVE_LZMA_H to config_freebsd.h - activate support for multi-threaded lzma encoding [1] PR: 233543 [1] Reported by: cem MFC after: 1 week --- lib/libarchive/Makefile | 1 - lib/libarchive/config_freebsd.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 634ef7157be4..d3204e1f2208 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -7,7 +7,6 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive LIB= archive LIBADD= z bz2 lzma bsdxml -CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 99f50150605e..3ff4930d339e 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -133,14 +133,17 @@ #define HAVE_LCHFLAGS 1 #define HAVE_LCHMOD 1 #define HAVE_LCHOWN 1 +#define HAVE_LIBLZMA 1 #define HAVE_LIBZ 1 #define HAVE_LIMITS_H 1 #define HAVE_LINK 1 +#define HAVE_LZMA_H 1 #define HAVE_LOCALE_H 1 #define HAVE_LOCALTIME_R 1 #define HAVE_LONG_LONG_INT 1 #define HAVE_LSTAT 1 #define HAVE_LUTIMES 1 +#define HAVE_LZMA_STREAM_ENCODER_MT 1 #define HAVE_MBRTOWC 1 #define HAVE_MEMMOVE 1 #define HAVE_MEMORY_H 1