From nobody Wed Jan 03 19:16:00 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 4T4zw05jBmz56WMy; Wed, 3 Jan 2024 19:16:00 +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 4T4zw03hnjz4BQ5; Wed, 3 Jan 2024 19:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704309360; 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=uejLGusf8vThGZf08r9xqU3g/0YwnHQoOnCONj523dY=; b=uy16iLw96ID90vEB2gVTWfX7d3/i0h7n7jsliYMqD6vVnv9QrWHH0Uiil1cDLSFNizZrii HqrRNtnMDMVPKNmdcjaSO1aqozfrNJPpeFfyEpbd2hZNoEk1jbgTZIQYic4dM0wa3fFuF9 chHu2LaL7N94VVnkbOHgmOnypiGM74HVxBJxXMX0HiQ+TNGSRWOqE2H1dhU5fKUGa9g3+y GZ1jAbM5Gl/MIu87VjfvqtGCU86Slltz9I/HeRwh7paqElAF9rkfOVcMDOA1swkU7xvMfV gj/wA+bzOT9NvtGF6SAEngxF7w9IKb64tYlGPhBN6f+MLJe3YT0wUxHQ8B33lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704309360; 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=uejLGusf8vThGZf08r9xqU3g/0YwnHQoOnCONj523dY=; b=SxFy5BGu7CVoaWTcd/iXmqcG7assQMQgjH30+pmODkm3Tlv8nlb5SIRXZjpL35/j+VJYAb Tfin/xnobqpqNImVKy85lrY8K9oVBkn5FcBpOr3bZ1rmK46qopnGBAo8cDXnfqVLaUEjfb 2Ka7WVugHs4bM/UjtI7v7XXCrB7ypEvXbJZ9jI5Kw7hlHPH/AvQ+KiK5plRnESC/109oX9 TkIxEwV7RfZoKs3Y8+O+Ys/k0mmf+2dHyKSBwzK2qbAuA6ylEFuJ4f4DqebYbXRW+nmUv2 lfNcB2EsQpL0ebAF58wOkNh7mHpEZwh20aBWQVL2p2BZMIpgs8jOLyZdrlGNxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704309360; a=rsa-sha256; cv=none; b=pPa9x2cgOOSTF7Ahkb7wGih7KUhsc5wNzOXQlms7SH+TKf9hlCzNRyzeXJL3gJMVJ9+1AM BAlAPSCcQtH4v1VCsVpFebSOIU9oMz5gP+s7UBaTYEktm7rHAomn4LPMLzVaYffeY8CP/I CQt9RfKwMYr3MMoaRXPkggzpwq/UTXwJ62S41nh0FMd+vjv/x0vrqaSt0crVBaTUfY6lcU TAhpPeZTkkjzWHxcDVKVhevTmNvG9cCbForhXdvPepasfpIdKSbmK1b4Y1antBdJBNXqz2 PsLxd7/t6kTvDyEy+0KwcJ7BVMleKXo/lBua2WZq8vPjpDr5JxMFrm7KuqUhWQ== 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 4T4zw02h4HzxMk; Wed, 3 Jan 2024 19:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403JG0Q0087238; Wed, 3 Jan 2024 19:16:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403JG04e087235; Wed, 3 Jan 2024 19:16:00 GMT (envelope-from git) Date: Wed, 3 Jan 2024 19:16:00 GMT Message-Id: <202401031916.403JG04e087235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 883a1b00fd13 - main - Makefile: Deorbit fmake support 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 883a1b00fd13dbc0e63ae49cdf73f88ee389d52a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=883a1b00fd13dbc0e63ae49cdf73f88ee389d52a commit 883a1b00fd13dbc0e63ae49cdf73f88ee389d52a Author: Warner Losh AuthorDate: 2024-01-02 16:17:21 +0000 Commit: Warner Losh CommitDate: 2024-01-03 19:13:26 +0000 Makefile: Deorbit fmake support fmake has been out of the tree for 10 years / 5 major releases now. The need to bootstrap from it has been gone for at least 6 if not 8 years. While we may still need to bootstrap bmake, we don't need to do it from fmake, so only retail the infrastructure to update from bmake to bmake. Retain, for now, the WANT_MAKE_VERSION stuff, though we're always up to date when building from supported and quasi-supported platforms. Also remove all the checks to see if .PARSEDIR is defined. It is always defined and was an early, fail-safe way to tell fmake from bmake during the transition. Adjust comments that refer to old fmake and remove those no longer relevant. Sponsored by: Netflix Reviewed by: brooks Pull Request: https://github.com/freebsd/freebsd-src/pull/980 --- Makefile | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 4a6f4bfd425e..2c4f7aaebca0 100644 --- a/Makefile +++ b/Makefile @@ -137,15 +137,11 @@ __DO_WORLDS=no __DO_WORLDS?=yes __DO_KERNELS?=yes -# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION -# can be cached for sub-makes. We can't do this while still running on the -# old fmake from FreeBSD 9.x or older, so avoid including it then to avoid -# heartburn upgrading from older systems. The need for CC is done with new -# make later in the build, and caching COMPILER_TYPE/VERSION is only an -# optimization. Also sinclude it to be friendlier to foreign OS hosted builds. -.if ${MAKE_VERSION} >= 20140620 && defined(.PARSEDIR) +# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION can +# be cached for sub-makes. The need for CC is done with new make later in the +# build, and caching COMPILER_TYPE/VERSION is only an optimization. Also +# sinclude it to be friendlier to foreign OS hosted builds. .sinclude -.endif # Note: we use this awkward construct to be compatible with FreeBSD's # old make used in 10.0 and 9.2 and earlier. @@ -252,10 +248,6 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH:Q} ${MAKE} MK_AUTO_OBJ=no \ .endif # We often need to use the tree's version of make to build it. -# Choices add to complexity though. -# We cannot blindly use a make which may not be the one we want -# so be explicit - until all choice is removed. -WANT_MAKE= bmake .if !empty(.MAKE.MODE:Mmeta) # 20160604 - support missing-meta,missing-filemon and performance improvements WANT_MAKE_VERSION= 20160604 @@ -263,14 +255,8 @@ WANT_MAKE_VERSION= 20160604 # 20160220 - support .dinclude for FAST_DEPEND. WANT_MAKE_VERSION= 20160220 .endif -MYMAKE= ${OBJROOT}make.${MACHINE}/${WANT_MAKE} -.if defined(.PARSEDIR) -HAVE_MAKE= bmake -.else -HAVE_MAKE= fmake -.endif +MYMAKE= ${OBJROOT}make.${MACHINE}/bmake .if defined(ALWAYS_BOOTSTRAP_MAKE) || \ - ${HAVE_MAKE} != ${WANT_MAKE} || \ (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION}) NEED_MAKE_UPGRADE= t .endif @@ -278,7 +264,6 @@ NEED_MAKE_UPGRADE= t SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk .elif defined(NEED_MAKE_UPGRADE) # It may not exist yet but we may cause it to. -# In the case of fmake, upgrade_checks may cause a newer version to be built. SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ -m ${.CURDIR}/share/mk .else @@ -301,9 +286,7 @@ _CAN_USE_META_MODE?= yes .if !defined(_CAN_USE_META_MODE) _MAKE+= MK_META_MODE=no MK_META_MODE= no -.if defined(.PARSEDIR) .unexport META_MODE -.endif .endif # !defined(_CAN_USE_META_MODE) .endif # empty(.MAKEOVERRIDES:MMK_META_MODE) @@ -378,7 +361,7 @@ _assert_target: .PHONY .MAKE # The user can define ALWAYS_CHECK_MAKE to have this check performed # for all targets. # -.if defined(ALWAYS_CHECK_MAKE) || !defined(.PARSEDIR) +.if defined(ALWAYS_CHECK_MAKE) ${TGTS}: upgrade_checks .else buildworld: upgrade_checks @@ -470,7 +453,7 @@ kernel: buildkernel installkernel .PHONY # upgrade_checks: .PHONY .if defined(NEED_MAKE_UPGRADE) - @${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) + @${_+_}(cd ${.CURDIR} && ${MAKE} bmake) .endif # @@ -802,7 +785,6 @@ universe_epilogue: .PHONY .endif .endif -.if defined(.PARSEDIR) # This makefile does not run in meta mode .MAKE.MODE= normal # Normally the things we run from here don't either. @@ -822,6 +804,5 @@ UPDATE_DEPENDFILE= NO MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif -.endif # bmake .endif # DIRDEPS_BUILD