git: 86188fdaca05 - stable/14 - Proactively remove libc++ __tuple header file that became a directory

The branch stable/14 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=86188fdaca05f6cac1d67e2a57547dc6f423ba1b

commit 86188fdaca05f6cac1d67e2a57547dc6f423ba1b
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-12-13 18:53:17 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-01-07 17:46:19 +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 b76d6e6462f4..057bfe4fa7e7 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -125,6 +125,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 \