From nobody Sun Jan 07 17:50:32 2024 X-Original-To: dev-commits-src-branches@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 4T7PqY2gX2z55XJ4; Sun, 7 Jan 2024 17:50: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 4T7PqX5x2qz4MN2; Sun, 7 Jan 2024 17:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704649832; 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=uxfLDCwOnBx0L2dku/eRZnCGwJBTpUWGntvZAjPFQOE=; b=xsUzJj8PEaP0LUzJuwb7xO+l4wBbdE3deKVMu4Y5zOPS3TXQBplbDasIA4hg5SjR6+Vaei HUJ4l6rF/ft1ivpzFzArM+8bfSIiZS6SD9Oh2q9Go9DrZvfYrrHYKks6xlLHilHFkEZbPV 3temk8l/ukOh8RtySKxOGXwsOfJ8WBTRx76YQcNY7uNk8D7LO8NDGsuWHTf8OWz9DgWw76 PUxVZaB84SE5JjAIQhJsd3yv19ssvH/RQQKwD39vVr0+3vx0YLuW6rXHossPh7BxlR9Tv1 J+fxUbSHC0ZMOvnine0rtPlbJHyw47aJ7jOvb0yo0Zu4AtOLNC3kVXTbVcJqsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704649832; 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=uxfLDCwOnBx0L2dku/eRZnCGwJBTpUWGntvZAjPFQOE=; b=bV/M1BmaOzVIToI9zUHlSRalxE4ImygYCd0bpcBl+4BEddttsaE5owa7i3rkiBdWymyuuN bAloeWfWjCYPKRH8jL+zo78GjCXil8Nn0qlakmnhV4zqUdIEiHNYqX/7qU5YRNT3c2LnDW NGkTVCP1l6wl8H/ozDoqMdIyY9PtJPdn8aGzKX9+EV0FXcdju85T2i9AGX/SERgih02S0L YKKW6j5VL1fT+5BiwvbJknLKnGirhlk5M3SOJzpOMiYi0aQZPhRb1O4cV2sU4SAcPQ3trG Uw8RDFg31jZxQ27qC6fOdrbDqmyHdoFd0oi8TZAEjDDtKF9sLrfMM3+4+8Scgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704649832; a=rsa-sha256; cv=none; b=WpWd00oaIH42mH4w/UXuIVs8rL8pp3VHE05PGkWo6wA0Uba6MZ2pqsI6gaP2teDNUgLM/I gb/ZX6f/2phG6N4hTL2yL4GptQeWbnUoVzFCwvFgDMUD0se3KPthrpsoU4UHZx9wzeIdEg yRFYVJUoXaIydgxIkif1SWadByJCrHc4sWnv53R/UPDbg3llE5+9Sg+uR2B3VeFrizPwIB h1PkOfCckYflcBuoqmOKGjnKxp993toJMiaqp8T5jKIiNFmLv3rx5fHieHvkvlxMsgF+3W 4zjL9v1f1W9PXtGNFWwT0LuWAyuyMk5R7smEnicB+/jIxJoOeQPHkkGJsJjxEQ== 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 4T7PqX4pCRzYyx; Sun, 7 Jan 2024 17:50:32 +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 407HoWaV022204; Sun, 7 Jan 2024 17:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407HoWuu022201; Sun, 7 Jan 2024 17:50:32 GMT (envelope-from git) Date: Sun, 7 Jan 2024 17:50:32 GMT Message-Id: <202401071750.407HoWuu022201@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: 86188fdaca05 - stable/14 - Proactively remove libc++ __tuple header file that became a directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 86188fdaca05f6cac1d67e2a57547dc6f423ba1b Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=86188fdaca05f6cac1d67e2a57547dc6f423ba1b commit 86188fdaca05f6cac1d67e2a57547dc6f423ba1b Author: Dimitry Andric AuthorDate: 2023-12-13 18:53:17 +0000 Commit: Dimitry Andric 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 \