From nobody Thu Jun 27 08:55:02 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 4W8spH1mKrz5PFc4; Thu, 27 Jun 2024 08:55:03 +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 4W8spH1DGRz4VVs; Thu, 27 Jun 2024 08:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478503; 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=eZ6us/4VjmXyNE08uR3uC2w9KKbrC5BRHkP2BB6hV7w=; b=ifOIgLNfAM+hYr9kHSAZ5u11pt7jnVQ5A1XpK4kmjEYW3nuwKGt20vHKrr4WF4zBJlXkL6 aZ1hyC17a0xH/PDlrryXUeJp8Ujtk7aTew0fc8MtoJERlMw4ZJOdOQJkrN8LNzWt2Mpl5B 6fWsHc06uY3EH0fgeo+pI+RPeJDzbjFdbyQNlE96vtWRQ07tlbEitdrBHKhGZI4YVZ7COY WAMhTSgaZ87stxcwCx/8F23z20B5OZJ3qUDm7ITMMpRTuKUGJBnv4aRh7LOKbXxZxJANJm CU9JF1qEyqC50ZhJzENd58B7kJyTUWzqE13CHYepthypSybH1QJqXsKWI+D46w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478503; a=rsa-sha256; cv=none; b=mVz+mPQd2sTBbIyMN3J3W2qqdCa5OEOZ3xtFU/I5WDReeCZZKJGWaem5exe66sOX2B3Smh kFN1LtDy7pXT4eS7wZsUdlz26MaRJcOXWVFkXyzIX8FDOCmpHMSu5N0LzYEH4QcR95IRZ7 qEGq8tcSoGNlg1byzbVszl29OwEDIqY6ynQv5hSg3MRzhzIvJJcrmIfzANjWXX4neEToxU TGBiPHjvk/iafuTpoD2SGwZ0dPXzUJ7pM9ECWLbGaPeJpdzFcFEHmn8Fg+F8IQwq3O6lyI +mOgBMAVSb1DWIUGErc6C07cmAOxcNJHVZnEFkkjmMmUfq/BZzL7Xa9Mf8jjEA== 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=1719478503; 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=eZ6us/4VjmXyNE08uR3uC2w9KKbrC5BRHkP2BB6hV7w=; b=S2mLXJ4bEup+EDgAF0Qg6hm+dfCr8XsGD3R4PR2jUNShP9SBIiNUJDJTX5wWTgAl33sucu ne5wOPUBfEXKsrFAKc/pTcjKZS1OVb4t0au8cAWUpK/sSyufnbVa1g43oGFGtjbPYx/0XZ Nmz2/oqXxcHtBe8G66SsNW63xIbIJ8LTBiqSIS9J4CklufXCqAN6xBpWXc7I/q//HQVRsZ NUCvP2fgfHbW4VxsODK7KRevf01AN5g0SU3xu9qX0sfVPdYYKrIF5h74nZnpvVGqQGQ0ER z1f1iDccIKdweOh0CEipiOda4zEkXMLrxP28jr2nSYTqTrrV5m1LpsYsVT9vMg== 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 4W8spH0Tkjz1LBv; Thu, 27 Jun 2024 08:55:03 +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 45R8t28g009919; Thu, 27 Jun 2024 08:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8t28D009916; Thu, 27 Jun 2024 08:55:02 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:55:02 GMT Message-Id: <202406270855.45R8t28D009916@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: 8ef92ee26b9d - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 8ef92ee26b9d8e5bb76a759b6356119b5a8b8e9d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef92ee26b9d8e5bb76a759b6356119b5a8b8e9d commit 8ef92ee26b9d8e5bb76a759b6356119b5a8b8e9d Author: Baptiste Daroussin AuthorDate: 2024-05-03 13:37:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:53:41 +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"