From nobody Sun Apr 10 22:47:11 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 8774B1A88DF1; Sun, 10 Apr 2022 22:47:11 +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 4Kc6Yq3Pn7z4Yw6; Sun, 10 Apr 2022 22:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649630831; 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=2LbzNIYFd80tLySQ5rmPBESXYPx1t30RtixzejIU8gA=; b=cA3v2zF8Nnhhaqh91JkN7PIIT4Eu0bBLKHAi2NYSs8GofQ+IYrytXpdqVwEKg6HVIRr6Fp 4433xL9bIHvEl3zcXdmMVFf+tW0acMjEtZDKuT+nYHvWmujxq6yMVj772iOP6imKMbp689 o0tebWoeqOoc9FfHS32JnGncffqwawbU6hcb1Lp9uydCOl0adtkXOYs/M+e4YPEzJllS5o 2biTsSsvVwN4SNJjfGy6lgxCWMnPErvHokW3bzMWCOOnU2G9LwK4TbL22ysyBklk6svLZJ MD7xzHsrxPhkzWgeVwSrNe38+UbxMHXNQBObiMxc28gkXNi+G9n29BMizWh6Hw== 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 54FE717704; Sun, 10 Apr 2022 22:47:11 +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 23AMlBYC016213; Sun, 10 Apr 2022 22:47:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23AMlB8a016212; Sun, 10 Apr 2022 22:47:11 GMT (envelope-from git) Date: Sun, 10 Apr 2022 22:47:11 GMT Message-Id: <202204102247.23AMlB8a016212@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: 3caf7dd45d08 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3caf7dd45d08a5b7b7fafe39e7aae7d7f8d1a684 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649630831; 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=2LbzNIYFd80tLySQ5rmPBESXYPx1t30RtixzejIU8gA=; b=pX+cin3EMTh28JeD3zTjvjdNr+3vgxDAszGKEl+kESaKhr/lCOSLG/4co+UFcFfDPdaRod vAWhmaCOpYGFZfzEnjAzfh9Pid19vxbUl/UbEMxiCodrGiKzkvaungM+ebP8ZQYo2SADMf vvd2q6CcdQb7PEwmR7C+UvLPHxkt+lcba+qldrdy2iT1esa3j6oJ1ZQ28glqY4mzJLhne2 Fe7+RKXH2zmT4TOXH2cx2UPS6V7DCRPh6yD7ZK1MYY7Y4s8PFV+Gd0Dfd3ZbHJKa7GxzXF Ckkb6afNouGWiKvnUC5jsP/CZ1X/IXNRLsRo+MGoScUiLUe4vSdXA9DJwg5uDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649630831; a=rsa-sha256; cv=none; b=X6ACAYGjGVcpx8toixdMD7fQOZ8Tt2EKodmN0nn2tl4XK22aiDzS4D5mPgZyQq9MeJz0t1 ZEF0Mul14Cf0+i1Bi7kRK9kbS5+8XauVrhznAd9PJFZCTvhLUDPPOTGgU7nLYNsEBXqw1p 30r/T5VumMQo2Xr1LobZHoorC0HvJ9EhYOTVd+T2T0b2D0EI1w3Un7uB7C/ilt7tA0GrQs Mscidd/Xcx+IINf74sGBu9wznWWrx52O4Ov6uxy5K3H8Cx0kx2YMpHnTqVcgwwptdEuTJB qyUg2NZ4K2HmbfgMY4A1rX/FwKle8OCkd3QgeKQ7XJdgtqtx8oBenVra3S+c2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3caf7dd45d08a5b7b7fafe39e7aae7d7f8d1a684 commit 3caf7dd45d08a5b7b7fafe39e7aae7d7f8d1a684 Author: Martin Matuska AuthorDate: 2022-04-08 08:09:32 +0000 Commit: Martin Matuska 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"