From nobody Sun Apr 10 23:55:01 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5FA391A9A23E; Sun, 10 Apr 2022 23:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kc8452GlCz4klx; Sun, 10 Apr 2022 23:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649634901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95sdAcU9Uo0MmM8n6eY1wnVMUI6bgAK34/O1gQ8QSzA=; b=s25LqtvB/OzLmPpJaogCa2R1zs6qWs6RmcqVi2eZziVHaAXxl/PlPmE1gKJSv3GS+5siIf +FERu5JE6AvAtBpEz8pO2gjqTeo0V1l0SigrHhXdLaeDw6wVgkbzmy12TRxA7pUXp+xc13 Xj+wnsnDa4xyuKiiJAzWz/4XB0MWj0gmxRpLHgCNrcptbjeiqFY61gqJ+LMxWP2QeqANJt z+0NXJ0FDu2sQdi3lbvd7W0g3S9Aezq/NZcAG4OzNihRGfjMlLk0hBlXNhPmj1gmbghleJ E25zoeUa/Ko8lqUZFQxsneYMGihZBSL+/suX355kBue+Wp6EDzLtBJzuwzwwvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EA38184BA; Sun, 10 Apr 2022 23:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23ANt1MN010241; Sun, 10 Apr 2022 23:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23ANt15C010240; Sun, 10 Apr 2022 23:55:01 GMT (envelope-from git) Date: Sun, 10 Apr 2022 23:55:01 GMT Message-Id: <202204102355.23ANt15C010240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: b572edb09c4d - releng/13.1 - libarchive: fix zstd compression support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: b572edb09c4da2949b20a62e98cbf2e6df88e7e1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649634901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95sdAcU9Uo0MmM8n6eY1wnVMUI6bgAK34/O1gQ8QSzA=; b=qnSdngVi1Ty2OE/Svv8IJP7AXK/YXFSu1BhGq9WZT5jDfO53ruaTEfX75UoiEbL06iYU8N v9PosuMqH3VOakz8mIKt3A0rvxJahDiR7EyK9hwTB6z3k1MaHRh20npIHUuKozw+MKhJsu rvvKs20harVoTfu7Eem3Qd5bphZRViMn4zJGMM5V0UWmNzQN77vEWc8qlUHPGZjNoL2I+g E+PLEx1ILzKoTrK80ZdjJj8b8LTvgh+p+Hw9WcpCGO5XT9SfahDhaRljDBFFaOVeKO0wvH MAlAFIOMFwfyjbNA6lP2B6UdF8H3Dk46Z7or/luUzH2B3oNV+k+i2aFbtBN2uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649634901; a=rsa-sha256; cv=none; b=unPUomNMmkV5R2NvVR9ZfDu1GRb2DFQswjTtb8UR8RI/XtdeeUj/KMsWjxSaqMCNISraDv GJ/IWLv1dNuRWi4QDB3uMBCrtfNKuFQ153+h9vQOAV/OVEqdgvsPYK5hTeLaNbhnwh5YH5 fHoDizlTeYO9zCzAkHOyATDOH3nPjGtVyei7A6GPcGAUHefceB8m318WUo/eEdqRhqYD2/ VYA+4FH1hxwqcHSojHG9TlX9gMzHixm7hRGWOPeVSsxrN0VqMEds/uaCO6ErAnExM2xAnZ C5fN5lFEjklI1aVQSBlY2EXnNDI1MS4HqghdgD+sLwzjoOSswkY39PBuXGvdqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b572edb09c4da2949b20a62e98cbf2e6df88e7e1 commit b572edb09c4da2949b20a62e98cbf2e6df88e7e1 Author: Martin Matuska AuthorDate: 2022-04-08 08:09:32 +0000 Commit: Martin Matuska 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"