From nobody Mon Feb 13 21:16:50 2023 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 4PFxwy4xp2z3q5qh; Mon, 13 Feb 2023 21:16:50 +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 4PFxwy4S1cz4X3K; Mon, 13 Feb 2023 21:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676323010; 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=CXYi6NSX2I6F4wPKnIEEx3I/KV5QCxyKtAu5bzVmUPg=; b=I/Nwv23f1M65Edkc77P13kcxsM+2A1Y9TJqrMwDWyrDNRXjziH1lW7GsjpiBZbVpme9uFb Qkq8Ia7YNGFbvqzWbIep2UkkyQ2+lD64KsrcKUG+RZcuKnrbgVx1Wn/r5hWikGRYaoSLCF VGvUd/Xk3vVzF5wbA0zENAnY7EysQWAFbKPls1hUM1bOUgny+UfuqQvyMwHwLe0EXBDscz JDVEphTUOkS4wG6OhBL7c1tOrF4APXELmCXEWwqt21epZWvsDhz33oMiVhm9zzXbLOfBZx wct7eNF7bzgMDgqwgGZ4Zh7yShRDslZo6d1VwShpSfcLZcpPIcmZFIywvptl6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676323010; 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=CXYi6NSX2I6F4wPKnIEEx3I/KV5QCxyKtAu5bzVmUPg=; b=evIkRIn+ZCB0ABpa3NsMdUVZ/kmafY5/521AxnXPlhffkB541XFJaoekpLk7B4THgc4vhF bOzns3r+KAr3r2Rp63qgix2WualGlQtXdpVr4DH425FK8ol8AfPlzuheTThdZtGaKwGDpr 4REQicBG18JtVrRyApavOKm8OFdUSeeIGGq2/eye6KGMQqz2VCqwk+/Mu56g9JU+guJAGW WNIcyWzTrJK/k8xourpTd4CUwrgi7W5+GvB+7rL1PR/yzOby+HO4F5bEbm9z2OgmIle68x Pj12PNSjKsHTRniqk0TvoUKUOZFsx38QMWtJYZhB0wXK7jh1euVdVxfNGsB5sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676323010; a=rsa-sha256; cv=none; b=yqTIH3y+GP2cYS+ZM37KFKMU6+fb8LLHYZP/xMqEnyUGyCbTF6guebVyrzpa2n12mBh85N 8+0v9/b2lJCER+quSgF7/5KUi2tceEazTEH/mmwLetbxwy115mHv3XqEQ+Q+c8bkNPl3Rn vW4fhhVnGkdKh5LPao5YRdm4yLlgANrhYgCTw1H9i+SmnSgOR1eyuNyARW5R3TuFxPyDGk amxh8mPk8m143u13wzCTsm/awrl1bfU40tPLodAMy4TszoVFnKQ64bsB5x9ryZv9fV1LrC c89DZhP3ppDZ8gr8xBEZcp3+82NKDWbO/d9RN0eYGaCJzefS8Lxoa37C2ed5YQ== 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 4PFxwy3WWTzYDv; Mon, 13 Feb 2023 21:16:50 +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 31DLGoxI070889; Mon, 13 Feb 2023 21:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DLGojF070888; Mon, 13 Feb 2023 21:16:50 GMT (envelope-from git) Date: Mon, 13 Feb 2023 21:16:50 GMT Message-Id: <202302132116.31DLGojF070888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3dfd18a769df - main - Remove support for the base/* toolchain ports. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dfd18a769dfee663cd3d5e6eba05bfe8c1d0e2e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3dfd18a769dfee663cd3d5e6eba05bfe8c1d0e2e commit 3dfd18a769dfee663cd3d5e6eba05bfe8c1d0e2e Author: John Baldwin AuthorDate: 2023-02-13 21:16:24 +0000 Commit: John Baldwin CommitDate: 2023-02-13 21:16:24 +0000 Remove support for the base/* toolchain ports. These ports have been removed so these knobs are no longer meaningful. This reverts commit 608289394f655d0635c71233248b734010fb4d2f. This reverts commit 39eb07f172921a581ee9b33ca2765905f4235202. Reviewed by: imp, bapt, emaste Differential Revision: https://reviews.freebsd.org/D38562 --- Makefile.inc1 | 2 -- ObsoleteFiles.inc | 4 ---- tools/build/mk/OptionalObsoleteFiles.inc | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c6f0269f8885..3399e469ea02 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -67,8 +67,6 @@ TIME_ENV ?= time env .if defined(CROSS_TOOLCHAIN) .if exists(${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk) .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" -.elif exists(/usr/share/toolchains/${CROSS_TOOLCHAIN}.mk) -.include "/usr/share/toolchains/${CROSS_TOOLCHAIN}.mk" .elif exists(${CROSS_TOOLCHAIN}) .include "${CROSS_TOOLCHAIN}" .else diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 59941a50b7d6..2f676ae41e14 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -6382,7 +6382,6 @@ OLD_FILES+=usr/share/man/man9/sglist_count_mb_ext_pgs.9.gz OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h # 20200606: retire binutils build infrastructure -.if !defined(WITH_PORT_BASE_BINUTILS) OLD_FILES+=usr/bin/as OLD_FILES+=usr/bin/ld.bfd OLD_FILES+=usr/share/man/man1/as.1.gz @@ -6391,7 +6390,6 @@ OLD_FILES+=usr/share/man/man7/as.7.gz OLD_FILES+=usr/share/man/man7/ld.7.gz OLD_FILES+=usr/share/man/man7/ldint.7.gz OLD_FILES+=usr/share/man/man7/binutils.7.gz -.endif OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc @@ -7191,12 +7189,10 @@ OLD_FILES+=usr/share/man/man4/bktr.4.gz OLD_FILES+=usr/share/man/man4/brooktree.4.gz # 20200229: GCC 4.2.1 removed -.if !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/bin/gcc OLD_FILES+=usr/share/man/man1/g++.1.gz OLD_FILES+=usr/share/man/man1/gcc.1.gz -.endif OLD_FILES+=usr/bin/gcpp OLD_FILES+=usr/bin/gperf OLD_FILES+=usr/include/c++/4.2/algorithm diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a6b9532fa2f8..b0a425aad67d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -201,12 +201,10 @@ OLD_FILES+=usr/share/man/man8/bhyveload.8.gz OLD_DIRS+=usr/share/examples/bhyve .endif -.if !defined(WITH_PORT_BASE_BINUTILS) .if ${MK_LLD_IS_LD} == no OLD_FILES+=usr/bin/ld OLD_FILES+=usr/share/man/man1/ld.1.gz .endif -.endif .if ${MK_BLACKLIST} == no OLD_FILES+=etc/blacklistd.conf @@ -2113,7 +2111,7 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif -.if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC) +.if ${MK_LLVM_COV} == no OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz .endif