From nobody Wed Jan 03 19:16:01 2024 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 4T4zw14vxxz56W6c; Wed, 3 Jan 2024 19:16:01 +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 4T4zw14MmCz4BMy; Wed, 3 Jan 2024 19:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704309361; 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=uFA3vm6i3DR/B4mYp+L5BfmzJ06UX1yYMlQpG619FR4=; b=el/uvhB2L4hP+95WawnHcVmEbRweyrakMPcB2VEBUaAKC0DrxVMeiPOp1ADPpjYKIrxYFg RdZoRVgIOFQbMSLoY/hPTeXUtId8LJ9r3ilWItjIrutriD06xO4L4yhEN2LSus99ZPp14v JuwYmR+KiiH+otD9wqDcUJwBw4QC61EeAIL0KKQ7Rsb0IaAPy4P6ZNYLbmJVZpcqIEM3Vk LveRoXl8SbZ68egvXzPfxR4MNQ4bMEPwfv2NuUpdIkCgmlXQeUgC2N2TYn9YisbpXDaAuC tc0iq5FdNfJ3qlqsco1FNHb2hpeSV9RlKmq3uvC71eX3HkmZlW/G/6pYzWtNSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704309361; 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=uFA3vm6i3DR/B4mYp+L5BfmzJ06UX1yYMlQpG619FR4=; b=ZECWgUuEiW3vg3WmrMd/DRjERgYFDgZwcGZpfFaq13BTcRZ+DCQzEOx7UO1OheNll86udH +vs8TaQ20BSNF0BoUp/LZrUUnvSXrMBNFncQN021G3zLJfnc0uw1Ll5R6zEc2zPnbNVvcJ /s1u1ozfogt+da/j1tCqjSdQts8sXa1t+Yb479B6uyhNoaCL7R4MwuPrfIrSsEpE9Hth53 lLSTvD2f9HByr4erq+UQZuK71RDG9mrDg+XY7cw/NoGPnSvITEYaIpf3d3mprxQiemCynI 0VXnZziTcKyVm48bPR2TRv3b1jOrF7kWJ4wJ6u5zVS2TqNxZI0/EgXHImp9xBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704309361; a=rsa-sha256; cv=none; b=nCTz+WUYrV/H5i75swBZeJJa10c3sI3AflvbGF/xuSntO2/4zUoegaVmh8v3vBuouoGrB8 IfuyoXI2UH+g5MZhRwLlQsOmRi3BZJUdVRKmp2FoBjXczPqrnJsP39Me0dxiIdij2ZkGz+ w4oyuHzhqwBnE5znjzPK2AbhZB7X5C4ttCfdbgYYJ7ZeyBlkk5gE4XxmAHIwGRJEOWpSs2 o9qCfT9kUXCMRXrescdi5LR64mUWyQvEJlZGfVSs3vZgXgXWFBsAq0kRoyfBygiFQuKk99 MKICYr0GRvQOExAqGTjCLjiLi/uS+Aa54779AYiqJPP/DzVv5oQfdXJsviAJyA== 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 4T4zw13Rkkzx7Q; Wed, 3 Jan 2024 19:16:01 +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 403JG1aw087280; Wed, 3 Jan 2024 19:16:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403JG14w087277; Wed, 3 Jan 2024 19:16:01 GMT (envelope-from git) Date: Wed, 3 Jan 2024 19:16:01 GMT Message-Id: <202401031916.403JG14w087277@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: 01918855cfc9 - main - bsd.own.mk: Assume a modern make 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01918855cfc9e5ce4c324d11c6b3b9a149638174 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=01918855cfc9e5ce4c324d11c6b3b9a149638174 commit 01918855cfc9e5ce4c324d11c6b3b9a149638174 Author: Warner Losh AuthorDate: 2024-01-02 16:33:19 +0000 Commit: Warner Losh CommitDate: 2024-01-03 19:13:57 +0000 bsd.own.mk: Assume a modern make Commit 83cb5bae966d7 added a check for MAKE_VERSION being new enough to handle CTFCONVERT_CMD being an empty string since fmake of the time didn't support it until just a few commits before 83cb5bae966d7. Later, it was augmented with a check for .PARSEDIR to see if bmake was running. fmake and boostrapping from fmake haven't worked in maybe 6 or 8 years, so we can remove the check here. If you want to update from your FreeBSD 7 or FreeBSD 8 systems, you're even more out of luck than you were before and must jump to an older version before jumping to current for the source upgrade path. Sponsored by: Netflix Reviewed by: brooks, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/980 --- share/mk/bsd.own.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index aec88d64850f..bc53f3679e77 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -154,10 +154,8 @@ ____: .if ${MK_CTF} != "no" CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300) -CTFCONVERT_CMD= .else -CTFCONVERT_CMD= @: +CTFCONVERT_CMD= .endif .endif # !_WITHOUT_SRCCONF