From nobody Wed Dec 13 18:53:36 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 4Sr4Pr50h6z549Rg; Wed, 13 Dec 2023 18:53:36 +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 4Sr4Pr4LM6z4P5y; Wed, 13 Dec 2023 18:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702493616; 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=0xm1B1mZ01idtLzGWgiILS4YS2GDQm5ZBfjO4Kkgc/Y=; b=vcDjOSWIZWt+mDkMw2pACXDainDRBbdq9NZ3lt4LQAQ5KbqIXgmPsassh9cE/vXkuI0ImL oPC5Z8pCj5FcGnUD36400kqRRMlUidfMJOiwz7wJm9c4EavOiSalryv8OCKKwSsy3CYY6U L/cBrp59+AgOufDITdfCmn6hjUXLArvE2iseOwwEgL+OkmqhYaSeHGi1FcthUdf57d8e5G 4r9rs6VaVlHOQ+Q+3BnEbUvo96HcgUCHxpYOq4B+NSunas9ZWJBTeAsgrJ4v1aRRNGKkqs LexTMnD1680iNAHvV5Gf0+AGjkt7BhK+k4iuQ3xB2cvjmg2TO7OYGXxcCcjZNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702493616; a=rsa-sha256; cv=none; b=eUg4akAR2jEdoieDEwbmPQLLIm7MMyqMB2bnZvsooICc4sq3JFto7uCZlqHGCpAs7YPF4i IWAzcFxDsYVQXqgP3N8rVR0sOEeRjwdhuU19OYk7Xtgyc7j/n9H0jT+mc5ryQKTCmC1hEP oMjpscIQJgNgCvtYv0Rz5WphyQTVW8iDLjwKmr+yk7npRs8Ff0S3PxTD21j9QXAHM8KHPb pvgyo85aAgZlIWOtB1f9CvEsq9mlpvxTNAiJcq3oPSvIr3CWxIS073pfld7U3IXMLLnKNi 5BXGi2/rnjyNeuOrlaGBh/OR6k6EqkBZjDXeM7RF3Yrfzluy3ZUbZg0Yj9U0Gw== 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=1702493616; 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=0xm1B1mZ01idtLzGWgiILS4YS2GDQm5ZBfjO4Kkgc/Y=; b=UWehs9jOgFxC33KQPc/2lxuDMK9SG1r0woqf2qrtltX4r0YQ6t+Bw9shLGZwHUTi39sZNJ 29JzGt0E1nd0Q4ND+b/urZXUoqv85VKFCQNjCNV9XqOuVheW8AcGE+cgucVHCtB1AEIzEf 9qmbSZwamoCCDEAYJ0b1K3unaa+CasyccVuiS2+9995itLqi9HZ9t+hosdOym4ml4D2ygF dxA+ZL77ow4dgH+7O9ufP0qUYmmktbbHgg8RyPl7aTSMGo4jhNHhXCNop2b50HcvseC3Q7 7V436ZEyZs+OG6+Qcttp8Ks5o1Q9BMBU2NeDM8rX9F/bNATx6mKUjEs3r6Qt/g== 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 4Sr4Pr3Pnrz197k; Wed, 13 Dec 2023 18:53:36 +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 3BDIraf0067655; Wed, 13 Dec 2023 18:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDIraCf067652; Wed, 13 Dec 2023 18:53:36 GMT (envelope-from git) Date: Wed, 13 Dec 2023 18:53:36 GMT Message-Id: <202312131853.3BDIraCf067652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ca217224f172 - main - Proactively remove libc++ __tuple header file that became a directory 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca217224f17229570f40227893353ca10ae1dda1 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ca217224f17229570f40227893353ca10ae1dda1 commit ca217224f17229570f40227893353ca10ae1dda1 Author: Dimitry Andric AuthorDate: 2023-12-13 18:53:17 +0000 Commit: Dimitry Andric CommitDate: 2023-12-13 18:53:17 +0000 Proactively remove libc++ __tuple header file that became a directory This was already handled in ObsoleteFiles.inc (see the 20230622 entry), but some people never run "make delete-old", or want to upgrade directly from a revision that still had libc++ 15 to the most recent revision. They would then encounter a failure during installworld, similar to: install: target directory `/usr/include/c++/v1/__tuple/' does not exist Therefore, clean it up in the distrib-cleanup phase, similar to the earlier instance of the libc++ __string header file that became a directory. PR: 273753 MFC after: 1 month --- etc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/Makefile b/etc/Makefile index b2a80d4a7b57..097b7e3728bd 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -124,6 +124,7 @@ MTREES+= ../${mtree} / # Clean up files that have changed into directories, as mtree cannot handle this # scenario. DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__string +DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__tuple distrib-cleanup: .PHONY for file in ${DISTRIB_CLEANUP_FILES}; do \ if [ -f ${DESTDIR}/$${file} ]; then \