From nobody Wed Dec 13 18:07:05 2023 X-Original-To: freebsd-current@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 4Sr3NC1Bd3z546sP for ; Wed, 13 Dec 2023 18:07:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sr3NC0DzJz4GxD for ; Wed, 13 Dec 2023 18:07:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702490827; 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: in-reply-to:in-reply-to:references:references; bh=D6bg8fGA5c+V4AyGdDgHvLBh7uNrPfXS7gPXbNt57u8=; b=rCBPwCI9xC0+L9Fmmr4q7PGE3S+SDUbKKTfpphz2iDdrwl0dIUaPX1RLg+El6cZr+oLbEj LqcgnzGfG3OzJ6p6sK5qBcP+Rd7XTN4gaezKu7HiqqaRsKm+W42mQLyMmVmL+Tubqrkfw6 3raKUimhmdf/0FdxOKAFN9+hgaarnFaPhac6sunXDkxRb0rREitmPeMAF/lmy9DIH+wHfN pBsU+/Kyb2QvD3YeMYLeyQO/DISR5IsU3n2aNjE7aWPJGsgWtd32tSjsQsE7s5fPoQqCot BBw0Zkg+xX1HnDsVhcQSB3spTsFjVp7APToEalYsUkHgTIs6Y6ufaqUN2Ow9pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702490827; a=rsa-sha256; cv=none; b=SLbiCcWDOt+efJwPeoTsGza3WnKzWsWExJZpjewaWfR/uiJl+NbXsHV3gJFcn7pB9doZds smsXmcm9QTIYzvglpNb47lrEgnM/KXEMst6IFJ0Sfdc4m/eTOF/xUqTjYdq704UsCk7HLb 3EDT5nq7Mvrke4R4K3kTZhd8a6wNo6J/UYJA2tNAIddUhO2AkenS2/iEnXXYs79rAb6OdS /zcBvBhSMHJuqvDMPCEr5/aHubUJ8qh/4RzawWtj7d/mQI5qqs/Z5X3LLip8mHN0mPGWLM EkikqTWlxUTP42ioC/OHxdKsQefrLjtsQ7mNM6Pfgi3KZ+BXdiG+oXD7mCgY4Q== 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=1702490827; 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: in-reply-to:in-reply-to:references:references; bh=D6bg8fGA5c+V4AyGdDgHvLBh7uNrPfXS7gPXbNt57u8=; b=MNjpoITeYsCnyuBQWp9/lNC6TOCHlXQzSUmQ588XGRfGMO7Zr9xlUsTsjtwWKQDZl8obUC ILlnotQI3eL3Af3C+Okry6EF6K3bDGc4pSPSjz1GZzbb4UHW2HzeDjf/IXQzb1L207Juvs v5vBjAUeZCvo+h2LzlRylMSK3JZx/h8pYfvt13a1jiv61xP/54e+C6DtoCwPL2nsugb3kv bnspjYc/32N1L3/2P6WzpB73WIDN3KM9Krw7rD3gM1WJxao2qCTEm/kXGEO4COFgI7r3z0 63jqwnnTvu8fLv0kRRsJySqXvnxACbWdgZpokcC9p9bwGKpie4OI1xJKt61zhA== Received: from [IPV6:2601:648:8384:fd00:59a7:b13d:3c5b:a4df] (unknown [IPv6:2601:648:8384:fd00:59a7:b13d:3c5b:a4df]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sr3NB54y8z1MSK for ; Wed, 13 Dec 2023 18:07:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 13 Dec 2023 10:07:05 -0800 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: make installworld fails because /usr/include/c++/v1/__tuple is a file Content-Language: en-US To: freebsd-current@freebsd.org References: <0A30C164-E509-45D1-8BAB-0B44A4E191F5@FreeBSD.org> From: John Baldwin In-Reply-To: <0A30C164-E509-45D1-8BAB-0B44A4E191F5@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/10/23 8:43 AM, Dimitry Andric wrote: > On 10 Dec 2023, at 15:11, Herbert J. Skuhra wrote: >> >> On Sun, Dec 10, 2023 at 01:22:38PM +0000, John F Carr wrote: >>> On arm64 running CURRENT from two weeks ago I updated to >>> >>> c711af772782 Bump __FreeBSD_version for llvm 17.0.6 merge >>> >>> and built and installed from source. make installworld failed: >>> >>> install: target directory `/usr/include/c++/v1/__tuple/' does not exist >>> >>> That pathname is a file: >>> >>> -r--r--r-- 1 root wheel 20512 Feb 15 2023 /usr/include/c++/v1/__tuple >>> >>> Early in make output is >>> >>> mtree -deU -i -f /usr/src/etc/mtree/BSD.include.dist -p /usr/include >>> ./c++/v1/__algorithm/pstl_backends missing (created) >>> [...] >>> ./c++/v1/__tuple missing (not created: File exists) >>> >>> Should I remove the file and try again, or is there a more elegant fix? >>> >>> The word "tuple" does not appear in UPDATING. >> >> 'make delete-old' should have removed this file. >> >> bdd1243df58e6 (Dimitry Andric 2023-04-14 23:41:27 +0200 965) >> OLD_FILES+=usr/include/c++/v1/__tuple > > Ah yes, that's it. The file was removed during the upgrade from libc++ > 15.0 to 16.0, while its contents was split into a subdirectory named > __tuple_dir. In libc++ 17.0.0 they renamed this subdirectory back to > just __tuple. > > This means that apparently people are not running "make delete-old" > after installations. Please don't forget that. :) Well, but if you have an old system with LLVM 15 that you upgrade directly to LLVM 17 you will hit this even if you ran delete-old after your last upgrading that used LLVM 15. We might need something to cope with this during the install target for libc++ in particular where this has occurred multiple times historically. -- John Baldwin