From nobody Mon Jun 16 21:37:19 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 4bLjyS2TJtz5yRZP; Mon, 16 Jun 2025 21:37:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLjyR5whWz3Jb2; Mon, 16 Jun 2025 21:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109839; 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=aw3jTY1zXHltyXkO6h2KyEddT2gveBCFYhkagQgg3TQ=; b=SeNRX1quCJrtAsSJYUBLlqRwdQ4yssMyzMM/dwLRotWaCCgEtrEqt85/MrxC/J/uvqfyOX bO0pnvOaAiF3uEKCNZwzi574yCZkqOuz4l0WADDbSS16flQmpJ11NcdC6BahsZGgYU5AdX oIsqtYQvkwF/UX6YPuurn59I597KjLOpUY0B7seDtyEQe9yB/oWxSi/qKAPdGBQrc/1Qiz 8PNWHcVVt54eQPqu9+k+BdlFREO3LKTNWjQiOlFnvSNLTJUdKF5nYIcomvYM53z01ICloZ IZGxmp5/iwwvAKZ+KT5zak6tzTFoEw9isULZebHyWDIgOtGfjoEjbH3lNVhXsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109839; 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=aw3jTY1zXHltyXkO6h2KyEddT2gveBCFYhkagQgg3TQ=; b=akgDVSF4CtIlzIpgWKDhsa1pCv53MVE0C0btVFuF6SYOcTHDkDmPQV9R05HhErEhFU8RrD thGCybRa6Fc9Lz2oe5QRsHjE52UL31sJjdZ03z997GboKtgeB1cLS9JnRXrUmNNQrs6V0m KOzVi9eOpKeUMTGWk5oU6r5lCHtNqTDy0kGukPPG/LijM80SBaUCXbD0fQda6t0xt8SPh/ KqjPqj+E1J1G09h87SR3A92nHPEMsXCZD3uLo8jRfnKfxxabq3N44JgqUPG+cPG2COH4Ux pltad4vEuZwyzNCJaRSJnZGRAHzsrF0EzlSdzfJ8tH6eTdgHTMkp4RgazPAz2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109839; a=rsa-sha256; cv=none; b=bmYXP8jAKPaLHU6eL0HtdaD1ko66GTHn/AuvlZ30s2MVJ9u1MKfOIcoBJPyEsl7PYfROfe qmiY8y+fkGmEP5Q3sOgD3WO6C3yLD5SzDVgX43T5RPL5nlGEwd2wMJa2wGjWk9cKoNJj1Y qhPkUHSs+UeOTTi885iGZXgXA343ZR0lNnj4k+T9WUoFZ5qSk92zH7XFqLX0vxhCCPbjIW fBbJkFVqxYfKIl3cnT6EgppCCL9csAsNHByE8rHfCS06f2bnFRPtBk2McDtqwqW5z9qd9H hJvwRMd77u7vutvl4sMfQNIrl3ptPlk7aENkomty+tWg2oXKfVrjfi7SmEKf5g== 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 4bLjyR598mzsl; Mon, 16 Jun 2025 21:37:19 +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 55GLbJPF072886; Mon, 16 Jun 2025 21:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbJpj072883; Mon, 16 Jun 2025 21:37:19 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:19 GMT Message-Id: <202506162137.55GLbJpj072883@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: 3923bf59f992 - main - tools/build: Provide extra headers on non-FreeBSD 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: 3923bf59f99295b66c8c36c4d5f03f9e39393274 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3923bf59f99295b66c8c36c4d5f03f9e39393274 commit 3923bf59f99295b66c8c36c4d5f03f9e39393274 Author: Jessica Clarke AuthorDate: 2025-06-16 21:29:36 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:29:36 +0000 tools/build: Provide extra headers on non-FreeBSD These will be needed by future changes to continue to allow building makefs as a bootstrap tool on Linux and macOS. This also requires defining __sbintime_t in our cross-build sys/_types. --- tools/build/Makefile | 6 ++++++ tools/build/cross-build/include/common/sys/_types.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 40ac498bfbb4..83f589ce3864 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -270,6 +270,12 @@ subr_capability.c: ${SRCTOP}/sys/kern/subr_capability.c cp ${.ALLSRC} ${.TARGET} SRCS+= subr_capability.c CLEANFILES+= subr_capability.c + +# Headers needed for msdosfs use in makefs +SYSINCS+= ${SRCTOP}/sys/sys/_callout.h +SYSINCS+= ${SRCTOP}/sys/sys/_lock.h +SYSINCS+= ${SRCTOP}/sys/sys/_lockmgr.h +SYSINCS+= ${SRCTOP}/sys/sys/_task.h .endif # ${MAKE.OS} != "FreeBSD" CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h diff --git a/tools/build/cross-build/include/common/sys/_types.h b/tools/build/cross-build/include/common/sys/_types.h index 408f0537d1e6..dc1b76f25063 100644 --- a/tools/build/cross-build/include/common/sys/_types.h +++ b/tools/build/cross-build/include/common/sys/_types.h @@ -48,3 +48,6 @@ typedef __builtin_va_list __va_list; /* Needed for opensolaris compat. */ typedef __int64_t off64_t; + +/* Needed for sys/_callout.h */ +typedef __int64_t __sbintime_t;