From nobody Fri Apr 08 08:12:24 2022 X-Original-To: dev-commits-src-all@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 D2F551AA75E9; Fri, 8 Apr 2022 08:12:24 +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 4KZWFN5fKKz3qv9; Fri, 8 Apr 2022 08:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649405544; 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=VHk7L0BEru25GJePnyX649TazUKvMdwBMOhYuh26tYg=; b=nfXL/f2lKsnInYqcR6JajMyrBJHtEMZDCXmSyek8nmgxcuTFMw+SbjzYqe4cLrYVap6eqt 5l4serbjAH+3BHJblWYHNYsvbDGLjh+EQuZh62GXAcsy0Mk5ZLehyaNOJK3nbSaOgkfstg e2KPVNkgtS5Q3WTvwrkeQBu/22TECuULanmSy9nFppQD6ftommEjjw9TSPk1u24U/eGK9F KtX/2D5awgyER0luIcz+7cR4GzkinjdPpRqdQKhfDrScyZBBLQQZC4o/rJbSUGkhR+JJPe yI6UCLtP3veH9P42+Fh1xz5wsD4rIf5WAVpWMOJegvYi+UQaOaaJTmtHHK9Kog== 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 A28E3211DA; Fri, 8 Apr 2022 08:12:24 +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 2388COB5047819; Fri, 8 Apr 2022 08:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2388COv2047818; Fri, 8 Apr 2022 08:12:24 GMT (envelope-from git) Date: Fri, 8 Apr 2022 08:12:24 GMT Message-Id: <202204080812.2388COv2047818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 7f815d4f128f - main - libarchive: fix zstd compression support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 7f815d4f128f063c1bac361c8f26b52ab7df1e6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649405544; 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=VHk7L0BEru25GJePnyX649TazUKvMdwBMOhYuh26tYg=; b=h5+fXhVJOk5LOB91dPcmFFpznxQNBVEm2tbGbt75ezJ2V55f01rMABoGJOR6BBf+/KJU5w LkHndAP8R0Uyx9uFfGVzLrMr1x1OqTOvpWJBbm9Lu3GTsiYmFlv/jb4ZqPkRBtpNpffT/S aew5cRdgB6LCR3JaNUlRhwwhyaOuZgnJ0v2pgwU07sopg7wewI4K5kDXzTMRtKnDiurY+i n97Y3y59l70mRQkDAaxauSaU7/hcvg+O6Xr8U8iulT7IhP/3igxejQTmRRKpSQWmF57Mom 7E3vvpvartHj/ZinBJ421hfmsj+JJy7RULAqwtx6xImH/7Fmlph4fqWvU8UtGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649405544; a=rsa-sha256; cv=none; b=b0SmfuI3qnGZzL7vDWMk3rJhkB7ymxXRsTx5m2ystHrn6N7kvVnIficaijd7VyBZbQwQtZ WO1BLEA/1pAzBjmNfkRT71uxlNTROIegB+Miwl2rAU3itQQhw4k0JBQX67gA+cjJ8XIFfx iY5zdSvrshQcIiPliO1ZyDKd112AW20cGbGDS2YgZp3bKCVjYdN4wbBYwzsFus1+P6cAdl vlm1PPVGFgqd4DEBCztZSP+dN5ZLVHtASKqtPUh8HLR3dLfnzfIF0n9lX3HtFTMN0VmmRB 7o0LaY9L2nTg2CS1nsJCOo+zuAF1jwxyEzxyHgpVpA3sYmEIUc1Peto8D8+IXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7f815d4f128f063c1bac361c8f26b52ab7df1e6c commit 7f815d4f128f063c1bac361c8f26b52ab7df1e6c Author: Martin Matuska AuthorDate: 2022-04-08 08:09:32 +0000 Commit: Martin Matuska CommitDate: 2022-04-08 08:11:25 +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 MFC after: 3 days --- 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"