From nobody Thu Jun 27 08:55:14 2024 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 4W8spV4jkkz5PFt0; Thu, 27 Jun 2024 08:55:14 +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 4W8spV4Dnqz4VcQ; Thu, 27 Jun 2024 08:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478514; 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=mbF+CHpIcMJ3u5HXEwCSORZ0g6SIU0HJZdavF4BgfcE=; b=C5A1Pgn+MrLQv83CpywILzNMP5BIlAKjpBZqP9khH0gjEvDHgM056OqQMJmFSB2fK9c+33 +e1FWA51C0SJ1Dxe74OYidCUH9We/vcI8bRoCWm9iQmQjHxDtQb7yknmbdjy3EUg5TYSDi ri8bLQM280a5/dXu8PziTehkfc8OJBSg5uWunNAPvTDMhmnFH8HQuTQ/HDllwCehKKuwmg gwYGUF25FpS7K1nmbiIiGch6MJIITB5lE7nbVf+qjF9mq3N68LG994edE6Kqt1xbHaaJ9d VB4Foxj95D2nNeamfXUduBqDVLpa/Q9dsI1XQ/ThzZbJBhPtqPOUTkGte18OlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478514; a=rsa-sha256; cv=none; b=l4Y1ljwq2JEXKixbp8jOqeuKO7u9afkcaGWfRXbgZEr/Cwt6hJu9xi1uq9s48Waj5o7qMm 3QmG/vqodaOGl6Xhu0zs7W6LusSqy7+oamAG36Lo4smsHMOHcO3NyEk13Py58tXnLGs2QG PsyocQRlay9HCFslV3l+LVYAYLUWg0SQDofmDR/lkUxf6we/lFKHgNCxx0yMdz7Kqb+EBI ePzJtrdw0zrSENTnU0TQsqVx2qNiaMnsSOh4BbdEMZXd7bAxUOB3/BtaRbIShj4lxyhO8f Dk6pxHZP20TNLUTJtJvsFGP0CYFAHBGxdx/Ir8GhBf3p7Ci0r3olZI9q50mvTA== 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=1719478514; 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=mbF+CHpIcMJ3u5HXEwCSORZ0g6SIU0HJZdavF4BgfcE=; b=yKvYPnArZOgb5IxLmBflly49aGvQNPWAa2htiIH2q7760FlZ1Kjuycy+WAQYjftMuKfvc7 hUDXg54vBRzxOj7AKtRBYrhTk1YqSXhH0AgC9EePryrMbFs8BHbiE++NIjJGcAPuEfhDe7 vaKdM53OwvfF2J+k1VJc6DytXY5IgN97sLYRoS5yo1MT3R76aVc7Gz8c3R1+9iWRUupFZ8 3DdH6BqXd+QcJ8uomyblp525QXpLIgMIeb5ffFOLwIpsC+RcWrN2YVUPASCLesPR7imzZa /JcTjWGXCg5pR3Y3QzBGEfFIkF8C03ilUOdyTwBipkGPbFnhdebQKPg4dJMWiA== 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 4W8spV3nvFz1L5k; Thu, 27 Jun 2024 08:55:14 +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 45R8tESt010074; Thu, 27 Jun 2024 08:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8tEuK010071; Thu, 27 Jun 2024 08:55:14 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:55:14 GMT Message-Id: <202406270855.45R8tEuK010071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 798c7248e7b8 - stable/13 - libarchive: fix thread autodetermination for zstd compression format 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 798c7248e7b83487b3c3a93540b826d8344b50e1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=798c7248e7b83487b3c3a93540b826d8344b50e1 commit 798c7248e7b83487b3c3a93540b826d8344b50e1 Author: Baptiste Daroussin AuthorDate: 2024-05-03 13:37:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:54:04 +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 (cherry picked from commit a25e0ba57ee17e75ab27fdc09ac3275a8215087e) --- 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"