From nobody Mon Jul 29 17:17:37 2024 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 4WXlRQ1ngVz5RckL; Mon, 29 Jul 2024 17:17:38 +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 4WXlRQ1HFGz4KGb; Mon, 29 Jul 2024 17:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722273458; 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=vdPdzlGGQ8S025xqei7wY0OYHYp0putdeMlnTQNu8LE=; b=DFXpO41niNuLPH3DzwP/FAf2yMgSvjW2a4EENDmQrsFEZ7Rr7pn2W2oSN7vVKLsZlX+TJO 7j+istm4Xtnzm6+w87Azp5PumNpIyiDHDxcl3RFB8MnzKaC+y0RBMwa+JbAHx6e3jChhJe jFniJSqoqdPtbXTLMmm2bmdaiW3Lkl9zH1gkb8ijUtcVY46pAwRtwCBSITSqk5Usf1kb/k b8s6d1Vgx0cgPit0V8/Ei93Oki5uCjzjDeYKYwogUS9gnXO390G4IAamMzSGL64VJsbZox gyH7af2hIEK2jQWm/N5GQboufKtEi8fHhoqIY8lIjYo55ZH1J7o98CSTSI8akQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722273458; a=rsa-sha256; cv=none; b=OJnk9qgwlNLElBjFK5aPbJaAwwqVjzYLNrzufGIEauL8gZBN7YzI/Acg6nEI1UYpFwQil8 kpqo3Fe23DAt813LrIUkuSZB0mAiiIKps6oS2NLE6gQpGRV/ar72qREE8/CMMQDOQs+mdK qx6MfBZS0+/lQ1V1K2dkE/YNRwdhHjfSLdsmCEnLnecnXqhZjZoqwdN43vnNAcnQDd/30L gYyHf8NmlHcKrqjbPSiRE/ehToHglGCa593Z3qPsu3aYTiB3AS+lJ5Ig+3jJVo4EeRTSTY pN/NclNJUTWmrsk0gD48BCSzwz29q/55obxCVZ7clp39t82qK1TxSFjQ7RhciQ== 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=1722273458; 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=vdPdzlGGQ8S025xqei7wY0OYHYp0putdeMlnTQNu8LE=; b=kNiQT0GxaT+rlr8pTVpOyWBCQZhot0UuNltVHhy7LibOpqVyVZoUdIeoI0XNbjOBn30qPs wyMpHL5Iqlx8DkHfdpt+2o6XU3QW61V7wzJglmbgNHiCOQNqpk8kpDP0wjMNJ/FOM3BRnZ 20ppZQzkeUQS5AoZfKR8TWMum+ZDLvLystvEs0FTgI2FqFxNbuU7HUapqO9Obf8AZLAdxf jIUbkrXh3bSk69yUqBRisnk0CDYPGzKoOod37+vw3q2vVd/NCV6nDtm9awwJAvFyePDY9+ ZNC+N7+EQVX9W1ls4HG7Pu56dvGm1is0umAei3HSCbTLWGf+dsf4QRaQ9KCTEQ== 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 4WXlRQ0Zfjzk24; Mon, 29 Jul 2024 17:17:38 +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 46THHbF0073223; Mon, 29 Jul 2024 17:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46THHbAc073220; Mon, 29 Jul 2024 17:17:37 GMT (envelope-from git) Date: Mon, 29 Jul 2024 17:17:37 GMT Message-Id: <202407291717.46THHbAc073220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ba373fca78a1 - main - Do not clean (in buildworld/buildkernel) by default 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba373fca78a114768244d6a8c27983da870c1169 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ba373fca78a114768244d6a8c27983da870c1169 commit ba373fca78a114768244d6a8c27983da870c1169 Author: Ed Maste AuthorDate: 2024-07-29 00:00:00 +0000 Commit: Ed Maste CommitDate: 2024-07-29 17:16:52 +0000 Do not clean (in buildworld/buildkernel) by default As discussed on the freebsd-arch mailing list[1]. For historical reasons FreeBSD's buildworld and buildkernel targets started by cleaning the object tree, for traditional (non-metamode) builds. Cleaning is not necessary when dependencies are properly tracked, and we have a somewhat kludgey script[2] to handle some known cases where deps were mishandled by traditional builds. Be consistent with the vast majority of open source build systems by default, and do not clean at the beginning of buildworld or buildkernel. Users may set WITH_CLEAN in src.conf(5) to restore the previous behaviour, or run `make cleanworld` and/or `make cleankernel` before starting a build. [1] https://lists.freebsd.org/archives/freebsd-arch/2024-July/000727.html [2] tools/build/depend-cleanup.sh Reviewed by: jhb, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46172 --- UPDATING | 10 ++++++++++ share/man/man5/src.conf.5 | 6 +++--- share/mk/src.opts.mk | 2 +- tools/build/options/WITH_CLEAN | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/UPDATING b/UPDATING index fc3abb285039..cffafdb5d247 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20240729: + The build now defaults to WITHOUT_CLEAN - i.e., no automatic clean + is performed at the beginning of buildworld or buildkernel. The + WITH_CLEAN src.conf(5) knob can be used to restore the previous + behaviour. + + If you encounter incremental build issues, please report them to the + freebsd-current mailing list so that a special-case dependency can be + added, if necessary. + 20240712: Support for armv6 has been disconnected and is being removed. diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 1d35823fc9c4..a12a2a8cb9f4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 22, 2024 +.Dd July 29, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -383,8 +383,8 @@ Build clang-format. .It Va WITHOUT_CLANG_FULL Avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. -.It Va WITHOUT_CLEAN -Do not clean before building world and/or kernel. +.It Va WITH_CLEAN +Clean before building world and/or kernel. .It Va WITHOUT_CPP Do not build .Xr cpp 1 . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 501df88cd776..d7e246d10396 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -80,7 +80,6 @@ __DEFAULT_YES_OPTIONS = \ CDDL \ CLANG \ CLANG_BOOTSTRAP \ - CLEAN \ CPP \ CROSS_COMPILER \ CRYPT \ @@ -195,6 +194,7 @@ __DEFAULT_NO_OPTIONS = \ BHYVE_SNAPSHOT \ CLANG_EXTRAS \ CLANG_FORMAT \ + CLEAN \ DIALOG \ DETECT_TZ_CHANGES \ DISK_IMAGE_TOOLS_BOOTSTRAP \ diff --git a/tools/build/options/WITH_CLEAN b/tools/build/options/WITH_CLEAN new file mode 100644 index 000000000000..d5962258bcc0 --- /dev/null +++ b/tools/build/options/WITH_CLEAN @@ -0,0 +1 @@ +Clean before building world and/or kernel.