From nobody Thu Dec 30 19:59:18 2021 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 95B91192D06F; Thu, 30 Dec 2021 19:59:20 +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 4JPzcm34gMz3lY9; Thu, 30 Dec 2021 19:59:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id A1ADE277C; Thu, 30 Dec 2021 19:59:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <4b9316c7-7590-e2b2-dae0-a8983cfddb2b@FreeBSD.org> Date: Thu, 30 Dec 2021 11:59:18 -0800 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: git: 5e6a2d6eb220 - main - Reapply: move libc++ from /usr/lib to /lib Content-Language: en-US From: John Baldwin To: Cy Schubert , Dimitry Andric , Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202112301610.1BUGAC8t054952@gitrepo.freebsd.org> <202112301658.1BUGwMkC009096@slippy.cwsent.com> <4179cbea-ce54-a285-a1ca-7002acbca778@FreeBSD.org> In-Reply-To: <4179cbea-ce54-a285-a1ca-7002acbca778@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640894360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yquA6oqYfagERBtcngmPbHPFPPTO8Fe/xLNpbryX1/Y=; b=EwqUJUQW6wiiHBqGsW496JNrmFOnW2Xdxi+vlWsv6nwYR58xYo3/FHrzcRACPOACu8fvlN A9M4kQDTKr/r1DzR8NBO0/UWL/uQfDmrSmrK8X7hOuLkvFPKyBl9faE/bGGPPatMjQZDKn K14P18McDazZgvBH771Hg36heiWyArVFPizr9wUTjgJUgSKGapTtiEZfz+AxFqAta8aduk UkIJEEiQQpT+Yl2K60CiiFhi/BgSSxCU/IqSPGoBu2nMnXr/f0Q1fzZrdexPPJp2s3knOV B6/Un1xN3pP4sdJoW80Y0VKWC2rysOpbW0pdkYxfVwvlS+EgAGhOp0UPa++yEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640894360; a=rsa-sha256; cv=none; b=R26qpINk0bxZwXmZjIYxFr7tsoRDARwgpeJnQs5pgtRoJaKegX0ybUv9mMZe5ydYR4k+FP LxOKCaHXBac30kGqcy7csCYWu+pGgz0Vs74yS0AHiHJZeIBh0bFxfmYTzVAEceDu6fx+zq ZnIGyUkZgIFCctR42Ef9RoySsC8+ca0eb6COayTjWI9JqZrRIMezp6Gcx4rBBPWCWY6BBc K4IswOePGrSD+s07GvJhv6hMMHFsVWR3JaGur4BNo6ePAd6xePNKhqYAgkq50UnVhDplkH aMI20C0D4KTbdq9qd+3QxEKhdW7sA2mzflXODUFIGPO9X95AStHOFFIWiTaSPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 12/30/21 11:52 AM, John Baldwin wrote: > On 12/30/21 8:58 AM, Cy Schubert wrote: >> This commit results in a different error. >> >> ld: error: /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/lib/libc++.so:2: >> cannot find /usr/lib/libc++.so.1 inside /export/obj/opt/src/git-src/amd64.am >> d64/tmp >>>>> GROUP ( /usr/lib/libc++.so.1 /usr/lib/libcxxrt.so ) >>>>> ^ >> c++: error: linker command failed with exit code 1 (use -v to see >> invocation) >> *** [libclang_rt.asan-x86_64.so.full] Error code 1 >> >> make[6]: stopped in /opt/src/git-src/lib/libclang_rt/asan_dynamic > > I suspect that NO_CLEAN builds are broken. You can try removing > /usr/obj//amd64.amd64/usr/lib/libc++/libc++.ld and building again to see > if that fixes it? If so, we might need another NO_CLEAN fixup rule to delete > that file it has has the wrong path. This patch might fix this automatically: diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b6ad7701c32b..d2e31dab31be 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -78,3 +78,10 @@ fi clean_dep cddl/lib/libspl atomic S # 20211207 cbdec8db18b5 switch to libthr-friendly pdfork clean_dep lib/libc pdfork S + +# 20211230 5e6a2d6eb220 libc++.so.1 path changed in ldscript +if [ -e "$OBJTOP"/lib/libc++/libc++.ld ] && \ + fgrep -q "/usr/lib/libc++.so" "$OBJTOP"/lib/libc++/libc++.ld; then + echo "Removing old libc++ linker script" + rm -f "$OBJTOP"/lib/libc++/libc++.ld +fi -- John Baldwin