From nobody Mon Jan 09 19:18:13 2023 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 4NrNyF2PYbz2pKpX; Mon, 9 Jan 2023 19:18:13 +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 4NrNyF1skHz4QrM; Mon, 9 Jan 2023 19:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673291893; 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=s0nsJU17gAd9E/AyRPTHEOuI0V327GW7jX/J0mi8IBc=; b=lDl9wpVXpY5CtjX+W5G4WKbg8bhTo7dbu/BUfYOEiqy3RVbB/XL+5TTvK7k7BvT9c2GH/k wGumxJIKWKLZ9NYgLK+2oWfYkUa7jICW2KQ2YRz1fRt20qytr9/0YoHBW/jUYHHE3hdEko 8eLDD/uzDBPujBcLbfuX52rEWygTKhV8bdElxlijaXVvVW1HRp06JAW7wV0e9UdKgEgUke GkRmWuzwbLne3kMnDNfmkCtuzbrx0yF0GHltmo+A6+LpygC/Pd2Z+E5du1AH5xP/+Nns/A xiele7efP07u8e9GbdxmIGWaSRV5oonZE4rbEM4crmyDhLc9yBny7xhuELmnTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673291893; 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=s0nsJU17gAd9E/AyRPTHEOuI0V327GW7jX/J0mi8IBc=; b=g1zFpf/9Z4pKOIhU944RmBsk0L9tL6l2TBXv4mZFH21gX5GzY0YpqQwUBKupTtHdnGLz0n +mTs7ztU4T4Guq+6EvaDvdccqmz8qIkWT1E9TsIYLPefTee4gfZ66tkjC+QQl57uRg9Zxl g3GM9LvJ08ajpgJnPFBha0A89Zos/0phu1gsmo+vaMRC6E9fS2WTpDcCjw3S/U0Rz3IVi2 A08ngEI7vnwmGgi7IyTTziz1YUOeDb8oj28NJeJWnUb5sxBoHmvSBcWE/s5ETjk071ziDZ G6TlezIOB90d/DsWuF2OsFgNeJqaUCYXWTUC6Ccl854laRh3Rx4ZOEKM/EvDrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673291893; a=rsa-sha256; cv=none; b=OuiKO0F+vHsbmrXjx9qRoBIKcLee9849DQKnBcfXoOI9MCL5xSZmfINsRk/N8F8lIyjRhr CAeaR3PRyMRH93bTzoMrqp/foo8HWPA745yu3iUPy8FdUD7wH3Uz1xQcDeFUM7E4e5O9Kz /GNi7o1cwYGu6O0kv58NH9a/295mr1wRg0G+Gixfbi+6KRBgVpcZviLSam2+vhl5eLOqXX GBQSUQ0p3hza5aSMBnANLSHbYJloNtjQ0uJnfpWQYP0QWIT/ah0cQqqX5nczPgCuUhFoac 8VdTEjO6PtLXhZ5MlngFmPgY07iqPcnliO8PdrxiNpwDvxyBFeFsH5qwTOM7Ww== 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 4NrNyF0x4NzfWj; Mon, 9 Jan 2023 19:18:13 +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 309JIDeY098152; Mon, 9 Jan 2023 19:18:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 309JIDQH098151; Mon, 9 Jan 2023 19:18:13 GMT (envelope-from git) Date: Mon, 9 Jan 2023 19:18:13 GMT Message-Id: <202301091918.309JIDQH098151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3b073d2ee50c - main - tools/build: Always bootstrap (sys/)bitstring.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b073d2ee50c042e7d83e5b18fd8b11ce827e632 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3b073d2ee50c042e7d83e5b18fd8b11ce827e632 commit 3b073d2ee50c042e7d83e5b18fd8b11ce827e632 Author: Brooks Davis AuthorDate: 2023-01-09 19:09:48 +0000 Commit: Brooks Davis CommitDate: 2023-01-09 19:17:48 +0000 tools/build: Always bootstrap (sys/)bitstring.h Older, supported FreeBSD versions lack bit_ntest() so hoist the boostrap installation out of the OS!=FreeBSD case and always install it. A more precise criteria is possible, but would add little value. This fixes bootstrapping makefs as a build tool on 13.1. Reviewed by: jrtc27, emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D37951 --- tools/build/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index 8c723e8be73c..53a735ae6295 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -150,6 +150,11 @@ INCS+= ${SRCTOP}/include/nlist.h SYSINCS+= ${SRCTOP}/sys/sys/imgact_aout.h SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h +# macOS's bitstring lacks FreeBSD-specific additions used by makefs's ZFS code +# and Linux doesn't have it at all. Older FreeBSD versions lack recent +# additions. +INCS+= ${SRCTOP}/include/bitstring.h +SYSINCS+= ${SRCTOP}/sys/sys/bitstring.h .if ${.MAKE.OS} != "FreeBSD" .PATH: ${.CURDIR}/cross-build @@ -157,11 +162,6 @@ SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h # 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