From nobody Fri May 3 13:39:41 2024 X-Original-To: dev-commits-src-main@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 4VWBk602Spz5K35K; Fri, 3 May 2024 13:39:42 +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 4VWBk55KwNz4pDF; Fri, 3 May 2024 13:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714743581; 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=6/Ugxu5INxWdY+udsHGDOFEkeBeFrXRYcmCMKVTSEQI=; b=JKnvVtlOZR3KbieUOFIOUOVEbzTWaMrQ4Qw147TlhE7NNtaneqN3SBdm9cjuPJdK2MLAiE L7Os8lj6qNtywVuT/pHtIjjQvcveKfrkr+rY3JaSb7TyClzWHOqDLhM92hgGal3fdQRhou 8HYTGFGEx/PcW/2NZvJFBdLlezV0VmAGsbKxe8WJaVIt3Jue+Xplx2ClczCxo6BLfV0LKy kvK+QqZa9NfR99Xki8btj1m2wCHrIwS3aYyFVVybdM2K4xohp+I0enlKZn49EwlYQvSlbT 8nqlrYBidFT0xFpuH0S+SScRwQetvOzr7/IBJMpBfR9cs9FioMJXnhtB9eClsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714743581; a=rsa-sha256; cv=none; b=AQtenYjapiPDrw66ttNMIfW87+nwSnJlG0RpjfgURq5zFKkUGWhvpi/Ci4ubTh3a76V9i4 yIvdJ1BLuBvfHc2QpDnKf5/dLvGj9U+ZyvHNVptLjptoVEJEq2Hs5pMEEneDBHpvCf9ydx 4055U03o92Rlx2l7A2Rga+Ic3RzyiJ0J2BhWM+hiDqD3bOmrssAtS/HB7ievZwl+fs4+OL MFQ+dmY8lI2iXlBRCP15YbUf1QB97dgKAtCH1TK6/GjJ3b3HFTNk+vBVl1f/LbRZEmiU81 MkjRMH4OwXe+sFjJolFHbJU9/IhvjMZFeNDMHnShJsY2h0aBmZBZKjsD3U/InA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714743581; 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=6/Ugxu5INxWdY+udsHGDOFEkeBeFrXRYcmCMKVTSEQI=; b=Zdeya5vMUKrsyi+Qj/vZhv+pP/nBLugBIbhkSL851zMoHuxkKTtTAmC6Y4NEI3WDRfkCzq isBp5YQ+U5nUyc1iCbBP+1KUbmoWydVGkcQB/vgBixXeDyaW1dDbFGva6c8New2dsHs8l8 4/NMwyc6WgOerYLD4RfQGmgtJxmvqAxVtAK2qPfuejMPzBsQlU8wbCl1SCog3kL8S7N2uZ a51PZpZ+tLG827s19CSGQ0YK0KQ6tvJEcixYRY831Fn6IG8YSyqk/nz4YK54o7rCltqkHK eVx+v739qsEpTf4P32lEbXT3fJmxEn/SKoJZndDUfYGsny1WySwcQBq3wy/VKQ== 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 4VWBk54y37znst; Fri, 3 May 2024 13:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 443DdfUV033484; Fri, 3 May 2024 13:39:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443DdfQJ033481; Fri, 3 May 2024 13:39:41 GMT (envelope-from git) Date: Fri, 3 May 2024 13:39:41 GMT Message-Id: <202405031339.443DdfQJ033481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a25e0ba57ee1 - main - libarchive: fix thread autodetermination for zstd compression format List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a25e0ba57ee17e75ab27fdc09ac3275a8215087e Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a25e0ba57ee17e75ab27fdc09ac3275a8215087e commit a25e0ba57ee17e75ab27fdc09ac3275a8215087e Author: Baptiste Daroussin AuthorDate: 2024-05-03 13:37:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-05-03 13:39:37 +0000 libarchive: fix thread autodetermination for zstd compression format The libarchive code uses sysconf(3) to determine the number of threads when 0 has been given as the number of thread to use 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 153f96b12165..755a39ec01e8 100644 --- a/lib/libarchive/Makefile.inc +++ b/lib/libarchive/Makefile.inc @@ -4,7 +4,8 @@ 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 -DHAVE_ZSTD_compressStream=1 + -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_ZSTD_compressStream=1 \ + -DHAVE_SYSCONF=1 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" .if ${MK_OPENSSL} != "no"