From nobody Thu Aug 18 01:46:44 2022 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 4M7SRS6mxmz4YvJL; Thu, 18 Aug 2022 01:46:44 +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 4M7SRS5D2Bz3lQX; Thu, 18 Aug 2022 01:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660787204; 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=JRuYNxhHWG5Ef4s8Yj9ykGkgavPfXrrCsTrEbJsRZQw=; b=eVEitgTWqDsJqEl/rqA93t4wjIDd5HJfvSWU2WEb9CoV4YznSvhmVDUMGK3E8VF2IQkNUk kskP3ZHRQqhlUKiXDZuZQnmeI7T8wU42EIPWrWJA2LcH0YgZgw4fQTeq4JfhzturURmHre jGR21G7LjQG56oFWmTvnja7WC4Esm1OWV4p0l+fZ/Cqc6FleHCrIJZVJvrtR2ql+K0ZfBv O8oLMNW5k7LEPvtwCW92ZSa1XjfSL/y7HYt4kSzxT/WrQb2zPC+onzCFYKfV0rRY2m2gT5 9j8I7Bc/4k0Jqo5MFaBD4BTQwBFYf7TWlwOB3E/QI94p9EBlybH7M2OIYktGqg== 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 4M7SRS4KhMz1B7k; Thu, 18 Aug 2022 01:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27I1kiuV095065; Thu, 18 Aug 2022 01:46:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27I1ki2H095064; Thu, 18 Aug 2022 01:46:44 GMT (envelope-from git) Date: Thu, 18 Aug 2022 01:46:44 GMT Message-Id: <202208180146.27I1ki2H095064@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: e9ba1fd5eda2 - main - tools/build: Provide FreeBSD's bitstring API when cross-building 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: e9ba1fd5eda2c0bc22edafa75b2ef10222bf24e6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660787204; 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=JRuYNxhHWG5Ef4s8Yj9ykGkgavPfXrrCsTrEbJsRZQw=; b=mPb1Z+DNlET23uQ1Dd5Xml4xkW4C++tgbrJaSYswugfIsTcwb1qK72XX1NL8J0aMLqvyWL OBFqbSacWrOQ4mygTB9yw4sr80HVQM1QsFwEPbg7tnGswYp+8ddopR4SfRPVS+AxvvpbRB aTCZ9JA7vTgtyPj/hehE8ICTfS510efMG08gzoGKroUc51haXbpoNZsBf/9wvZb1dDBOd3 o3fv6z5nndGesyOQkqo58K909TL3lYwsZkL89b+MSx8UJRLhQ7xjTokn5YuxcesbKQvgLI WtzVlODHsWBRlJI76AEyJjKXnlxKX2cUbTf33KarsCq90KFumuSm6uGCw9C9vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660787204; a=rsa-sha256; cv=none; b=qNu84qZ8sW0Ezp6nr7HZU1T0HmZ2fORMBWXetWveuONnPZrbKb760JOy2fBF/Ifsflf6Px oGttjHm1hC9KGE/+I0xMGGDgzojVyJPlS13E9+iEQDyGj4LCsP++zuTrOPSFE/iP99N9HP Ei73WucTfV1n+NQtHqr9n5cwG9D1v43i6Z7AG7sYLS1Pe4kDsh/8fSTTvqDzkdf5SyjidY uRv1ho/bXDUyYEbKKvZURSl7ywSrm7OGSsBHNqTCduyZ1iMFgZmDw5K6ZXKV6phOQtwHUi ID2sNSN3jveoPcGyrbe2Y1//cSnl0RD/FQ4RNRfMSrLFidn2AQpv0GsNqQgrBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e9ba1fd5eda2c0bc22edafa75b2ef10222bf24e6 commit e9ba1fd5eda2c0bc22edafa75b2ef10222bf24e6 Author: Jessica Clarke AuthorDate: 2022-08-18 01:46:27 +0000 Commit: Jessica Clarke CommitDate: 2022-08-18 01:46:27 +0000 tools/build: Provide FreeBSD's bitstring API when cross-building This is needed for building makefs as a cross-tool since the ZFS code uses these APIs. Reviewed by: emaste Fixes: 240afd8c1fcc ("makefs: Add ZFS support") Differential Revision: https://reviews.freebsd.org/D36133 --- tools/build/Makefile | 9 +++++++++ tools/build/cross-build/include/common/sys/types.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 49223f9d9d42..75dc6ab60553 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -153,6 +153,15 @@ SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h .if ${.MAKE.OS} != "FreeBSD" .PATH: ${.CURDIR}/cross-build + +# Needed by our sys/types.h wrapper +SYSINCS+= ${SRCTOP}/sys/sys/bitcount.h + +# macOS's bitstring lacks FreeBSD-specific additions used by makefs's ZFS code +# and Linux doesn't have it at all. +INCS+= ${SRCTOP}/include/bitstring.h +SYSINCS+= ${SRCTOP}/sys/sys/bitstring.h + # dbopen() behaves differently on Linux and FreeBSD so we ensure that we # bootstrap the FreeBSD db code. The cross-build headers #define dbopen() to # __freebsd_dbopen() so that we don't ever use the host version diff --git a/tools/build/cross-build/include/common/sys/types.h b/tools/build/cross-build/include/common/sys/types.h index 044ca6bed4f8..82436e7e9224 100644 --- a/tools/build/cross-build/include/common/sys/types.h +++ b/tools/build/cross-build/include/common/sys/types.h @@ -68,4 +68,8 @@ typedef unsigned long cap_ioctl_t; struct cap_rights; typedef struct cap_rights cap_rights_t; + +/* Needed for bitstring */ +#include + #endif