From nobody Wed Dec 13 19:03:26 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 4Sr4dP4Pq0z549pX for ; Wed, 13 Dec 2023 19:03:37 +0000 (UTC) (envelope-from dim@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 4Sr4dP3tyzz4R98 for ; Wed, 13 Dec 2023 19:03:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702494217; 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=C+nl4ZWeibDDOR4FfOx/867YPZl+U4pLhEIJIEXt/xc=; b=UM+qTqRS8+b0RNE0hmYOC3N3sm5h5CQxI0pnrWIrRhEEw8wLH2qDR3eVh9txrnNDZtP1VY 09QAVWDjKC5BdYB32g0uaPSmA0h2a+V2i1ndxC/D4zhySm5VZ6a6czTDCEAriMfPzptDe8 wbVxkoc2/wkjB+Mcd7+ypDj9tYd2dCykbGgzL5HQROVXFH1WspppZdMFzVIq69aj5ziz2l 8j+l9AblthWjCxZEqzP15nVOkPKr/NpfyJ8Xu2uP8gp9pDS+r9WofqReU4rtp4Uw5IbZmx FPkMgyxoZvy1N742+AKmQpsh1XL6MS6IWhRPwAN89auqjxIMroePh14WG+wUWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702494217; a=rsa-sha256; cv=none; b=vqhZg2Xunk4jaq6sOIKvQFVKZcllvghAA9lqFaj4mo2Cg8noXuYRH6uxDH5qVDEgJFMmxl 5xcfa5315dDwZgFlBqr438YWMagQ7Sx9G5UhgGM83xK5WM9IH63r7w7oqpGyPZNlruJE6j L66ZyHKu8cAw4buEpON3aansKJ+x9muOx3Gt9MZJEzSIcAV/Re5hce2ynTB3xgdTQVelSL txP7fdpiBPgbykqzZktzojfksVUqTzTihn5AlE1fdbSAoTeRG8Ck/YieIoZVI7jVzGUWuo Z6e/Ls971ZTFEg2My1TmvXWTkZyKLJCpXGGMRuspyyaemTiS+zUU69QT/2sUHg== 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=1702494217; 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=C+nl4ZWeibDDOR4FfOx/867YPZl+U4pLhEIJIEXt/xc=; b=n9GjNklWr/DO6X3THmjmyjcUoDg6pdOE1CdQr/Qx9qIUqQkFkd3eUzWsOYpvRxL+Y6YO+A sDxllxwMgpDbaXRiLYxUtFf2zZcg+A4aMF8GwPxAD7OVeIPpumaKbWnqoo5Q/AhoxWifSm Dv0OD1c/reLhMXVSPCSdDe8YSVhddkhjAyWywrKt1s3AGVnYIrpkj6fPuNPgWg0l3kQiGk 29ceD7O+SE/8YJrjRq/d1jDjQvIGZOHVdjzmKjlu1YNsBQeI0rKpHzsUd/egiskYdQ7fzC 5X5/Gjvu37oM2TcC51VQOwAYL6DRMgwFGXY2OFs2gpkh6MsgA7J+AW5ZiW1pCQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (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 (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sr4dP25gkz1NV5 for ; Wed, 13 Dec 2023 19:03:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3F3AB39ED7 for ; Wed, 13 Dec 2023 20:03:36 +0100 (CET) From: Dimitry Andric Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: make installworld fails because /usr/include/c++/v1/__tuple is a file Date: Wed, 13 Dec 2023 20:03:26 +0100 References: <0A30C164-E509-45D1-8BAB-0B44A4E191F5@FreeBSD.org> To: Current FreeBSD In-Reply-To: Message-Id: <5AD93DB8-F1D1-451D-BB93-FDC405A7B29F@FreeBSD.org> X-Mailer: Apple Mail (2.3731.700.6) On 13 Dec 2023, at 19:07, John Baldwin wrote: >=20 > On 12/10/23 8:43 AM, Dimitry Andric wrote: >> On 10 Dec 2023, at 15:11, Herbert J. Skuhra = wrote: >>>=20 >>> 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 >>>>=20 >>>> c711af772782 Bump __FreeBSD_version for llvm 17.0.6 merge >>>>=20 >>>> and built and installed from source. make installworld failed: >>>>=20 >>>> install: target directory `/usr/include/c++/v1/__tuple/' does not = exist >>>>=20 >>>> That pathname is a file: >>>>=20 >>>> -r--r--r-- 1 root wheel 20512 Feb 15 2023 = /usr/include/c++/v1/__tuple >>>>=20 >>>> Early in make output is >>>>=20 >>>> 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) >>>>=20 >>>> Should I remove the file and try again, or is there a more elegant = fix? >>>>=20 >>>> The word "tuple" does not appear in UPDATING. >>>=20 >>> 'make delete-old' should have removed this file. >>>=20 >>> bdd1243df58e6 (Dimitry Andric 2023-04-14 23:41:27 +0200 = 965) >>> OLD_FILES+=3Dusr/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. :) >=20 > 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. I have now added a workaround for this scenario, which is apparently more common than I thought: = https://cgit.freebsd.org/src/commit/?id=3Dca217224f17229570f40227893353ca1= 0ae1dda1 -Dimitry