From nobody Sun Jan 07 23:08:33 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 4T7XtT2gsRz56FCV; Sun, 7 Jan 2024 23:08:33 +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 4T7XtT1bL5z4Q3j; Sun, 7 Jan 2024 23:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668913; 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=xcOOZ+hl8/QgDW81WzEZ3x6yJrw3C8WV+rjG3+EzTwQ=; b=w65qOm2FzGCH+CDTSi1ag4+P/UOAbbZAkqK7V/ZZhv1ycPfRjpdKTuKdWu5QB3LuXJ2Epp IxjD7nCzKI0UYHQPXQS9dwD/D0vaIMx1d5nPKSDvh8bVbwKJexDCVFNkfxYuBWqy44Y2gx wiE+RvTJLrqmZ200I6bjX3BJvcq51PgKGGX+h/3OoWK1QxFG3XCZSTrB1wcW8Aaf1/120X nE6LErCcDk558UQAn9ztGjVsj5WOwciD6Mv5pOoFhRLUlobVtT99JiiAniDfrlGDmfRTIY hVhOe6YZriOr4uOlF4kqkDfRGuvBM4NLbmU1rr3HV359sqCDTtuNsCeV/fA0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668913; 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=xcOOZ+hl8/QgDW81WzEZ3x6yJrw3C8WV+rjG3+EzTwQ=; b=B7ro13BGQWWukZlp1h9TZwL8fnLPKC967ohBupJMSY7IEnwJk51YDLbmc/t0f4bk6BeDYx 9rm7Ng13Um1184NkeNnIO5okbeUBRJqrqAGbMSQhSME9yohC688K76DBOb2Uy7aoty29mL +2NQGq2Ht5t1tDEoG2xL6gIKoVmmeR/ALREHsrwECHcxlerfhwMWMC45R+kcFSPoC57hv+ MR+ZaITdSgk5+/Wuz7ZTYb6h0JvvnAlmwUjbkPJiJTg0KmXdvdsZkMvoyCPxhOKHAQGQSK vpnJsal7GpXTniG4dlF3SI7jN+nOxE6TvD5m0rIqPPvRiAf6LZZEAlBe1LQHkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704668913; a=rsa-sha256; cv=none; b=UMQ5ixd5KHGXHiHUZOgS/ZE8SLbx12WuTop5ooXJ12vguCevlNnqCDDT5JP18UPPl8xQHd 4QN2cz7y5JZ7j9V2J6RqieU2tFRBpfn//ofFvvG36cnnEkfT61ufTXcbdgfJaGcE59PmV/ dwgxxgMZ7tEnuhYE0OQx7XQIN8grGaxNM12Olqwhjng9/nCN7wJDW5qVcIlQ4ZxZCuE38i eG3/zGHSz38DF8EdzmqYAHvCkfGHl8nDFcV/69fITA+YZ4zg1ZnjwDIQ/8bWU488RU9CLF GljrwBtQdzE7xp6x9XD2tdXCv8DEB+8UkyQ4SYYwiYbSW2DeoBGqzstHNUE4xQ== 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 4T7XtT0jb1zk7R; Sun, 7 Jan 2024 23:08:33 +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 407N8Xrl053460; Sun, 7 Jan 2024 23:08:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407N8XPH053457; Sun, 7 Jan 2024 23:08:33 GMT (envelope-from git) Date: Sun, 7 Jan 2024 23:08:33 GMT Message-Id: <202401072308.407N8XPH053457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 33605894103b - stable/13 - Proactively remove libc++ __tuple header file that became a directory 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 33605894103bd4de4b90790ef40d13595ccab0af Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=33605894103bd4de4b90790ef40d13595ccab0af commit 33605894103bd4de4b90790ef40d13595ccab0af Author: Dimitry Andric AuthorDate: 2023-12-13 18:53:17 +0000 Commit: Dimitry Andric CommitDate: 2024-01-07 23:04:42 +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 (cherry picked from commit ca217224f17229570f40227893353ca10ae1dda1) --- etc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/Makefile b/etc/Makefile index 0959fda6a958..9b4b7c93d10a 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 \