From nobody Tue Aug 12 17:39:07 2025 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 4c1dzH5gRYz659Nt; Tue, 12 Aug 2025 17:39:07 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c1dzH4pHJz3xQb; Tue, 12 Aug 2025 17:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755020347; 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=ATu3NYHMhJLIeC9bngUhTLtNwPQV/VjvQaZSqDAcyHw=; b=h0Kaz5IkWPLCzJX34Sqj51W0wNlImv/1jnH9Qazy65quOJLN/UFC9lKuwOv6lUXTvX+Hxs uYtLsGyEMEB9ALHJiMfni+PFPyjCuuS0fKZJN0jpk97y5Ny/RoXmJA8lU77QnGB2uDqHiO M4YY25yaQzjbPdVY+zGSsPQinWihBnIOWAiCMSRVI+4aGiuoQ6/rY93AC/Gjn3p8Cbj+LD 9nuvJv4YL7z6aXVH6xs8oflIaxKlFEC1BBrVSnjHPpWkccJtwW3lLuL2Nm/MoEsHs1HmIh a4CSw5jQDU7kfRFDTYF/bkA8/T3OIpYrjuYuKls9eer8e10s0+Po9Lg5Zpln9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755020347; 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=ATu3NYHMhJLIeC9bngUhTLtNwPQV/VjvQaZSqDAcyHw=; b=sHVVLrp8/YFzHqHx6qkrvNk+eILWWUStUL0gUSKo+/UaweIQEUeZKKs/o99Zhncb7Wdtvg DtCNVemlVa5xq2o1NXfO0e4zOTLqH5IaHWHaq38zAQRaukMoBzUtakkJOhq2qE9zQgP1gp 6i3+iKc0msv63caz9JEUMIsmz2JyX9EpRbXpPSzqUYgIxIxS4VxylaelGwJL7t27n0l+bE jkw6AOTmPgNwSYW23mYuzixJmVd91T3eGk4bibfNzOURTbvG1JpCU4xgLzG8q1dES1P6J6 sQ52R0ktKkzxnJJluAkyD3xrdq9fHgXDL1S/uIt55t08Bf+DjMPqEm3R6gOeog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755020347; a=rsa-sha256; cv=none; b=l8QRnP9T90g74j5UsnNpQlcRgCBBoEUpyb2VVlWacS8OlOnGOVW5wv/By5ZOfDLJhr13FB e4fsIOr9BPDFvYa+71fPaA5lNsn62R06Ptpv3Yy5MX26cbGHBmrQBb5/ooDov69+sw4yx3 heDBWwa2T1J1NVIz51sgaFBpG3sNHHqjEDZPahDNxfm5PjHUI1XNWiRrcpuoWZQ5L0+dZ2 hpfyZ8tekQZ63fy3EQQf+Mf+DEi+RhjC2KnSoC/xQMZgThbSAEc3zg33YU7PDsBXbaU/hb ev+yraU5HSxpdBUr4sFdUXBVzBFd6iNuTPTaZ52AIfLgjr0sM8d9VCxUW0YYOw== 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 4c1dzH4MXBznw5; Tue, 12 Aug 2025 17:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57CHd7VT016237; Tue, 12 Aug 2025 17:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CHd7l3016234; Tue, 12 Aug 2025 17:39:07 GMT (envelope-from git) Date: Tue, 12 Aug 2025 17:39:07 GMT Message-Id: <202508121739.57CHd7l3016234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c9332a905cd2 - main - libspl: Don't build tunables.c when bootstrapping 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9332a905cd2788bfa1c72c8f170c94500a765a2 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c9332a905cd2788bfa1c72c8f170c94500a765a2 commit c9332a905cd2788bfa1c72c8f170c94500a765a2 Author: Jessica Clarke AuthorDate: 2025-08-12 17:03:25 +0000 Commit: Jessica Clarke CommitDate: 2025-08-12 17:38:56 +0000 libspl: Don't build tunables.c when bootstrapping The upstream source (which we've currently hacked downstream to make it compile, even though it won't work) assumes ELF for its hand-rolled linker set implementation, and macOS's Mach-O is sufficiently different for it to not even compile there. However, we don't actually need this file at all, since we only use the bootstrap libspl for DTrace tools, so just add it to the set of files we don't build when bootstrapping. Fixes: df58e8b1506f ("zfs: merge openzfs/zfs@8302b6e32") --- cddl/lib/libspl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 13fd6d96f2af..d8d997c6f377 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -16,16 +16,16 @@ SRCS = \ os/freebsd/zone.c \ page.c \ timestamp.c \ - tunables.c \ include/sys/list.h \ include/sys/list_impl.h -# These functions are not required when bootstrapping and the atomic code -# will not compile when building on macOS. +# These functions are not required when bootstrapping and the atomic code, +# among others, will not compile when building on macOS. .if !defined(BOOTSTRAPPING) SRCS += \ atomic.c \ getexecname.c \ + tunables.c \ os/freebsd/getexecname.c \ os/freebsd/gethostid.c \ os/freebsd/getmntany.c \