From nobody Thu Dec 30 22:26:08 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 EBE02192928C; Thu, 30 Dec 2021 22:26:08 +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 4JQ2t84nb6z4bkp; Thu, 30 Dec 2021 22:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 83EEE20880; Thu, 30 Dec 2021 22:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BUMQ8Hi057452; Thu, 30 Dec 2021 22:26:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BUMQ8QZ057451; Thu, 30 Dec 2021 22:26:08 GMT (envelope-from git) Date: Thu, 30 Dec 2021 22:26:08 GMT Message-Id: <202112302226.1BUMQ8QZ057451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: dda9847275da - main - depend-cleanup.sh: Handle stale libc++.so ldscripts. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dda9847275da79ccbb2f0b7079b250e28b3b3b2a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640903168; 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=g5aoJke1xiGyhG2xv0M6DQa9t8U1DxYssHTTSQwvoSw=; b=HJ8kvGFybfZa20Q8WX7qT87jrMos5hopzd+XOLPrA93Drp9x3ox4toe1yyZD1iSuebzFNn 0Rpwby65LgSxuidTzRt28APDufenCjrXIsyjsU1AMvVRndWaLwFAtCNFqz27Hbp27XoWdY uRR584+ccIufX7vgzNYCg4wV7uXi906E6T1UeFOSzsg1skPsRhnC72xGnzlChVSjBOFAK4 6h93chN1STLRniqejaptDbF4Rk6eKhCLGMA7eQyVyx/GbdQBH1lQn7E8ekQ4jJcRzqHmHg kskPgij2czf546ErHdo9QYfgGtJPrR+P8hGTDLO+1elZvwYH4Ha7L9aIstvZGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640903168; a=rsa-sha256; cv=none; b=Z6LZj918m6PgmHF94sr6n1IcDhWWASDdXBKMk2VxGyGMoKnmZlwHHIPG2YYjelRQvL9USb Hp4/ruOjaUxDdTWe7MkU0y9aXpNG/z8gMipL26iZKxeohlyquOLCZ29oFk5PfOYGOzrAbh bI7EzZeAgncww32AzBn+TlKmsiB4Ks60Mvh4hueyM05zWCE18hvCHl0s5Aup9V9DWs1USc nw/0hjog5OvlPD3mZnCIdCbXq4Iq0Et7XtHYxbiCG/jRquMu98qaV+sBNlfxoPlL9E94rr qOf+AZtLKoJU1xMpVJt5VQEryaxhSut2QnKI3kn+SGahxdPJs55At5pSox4A8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dda9847275da79ccbb2f0b7079b250e28b3b3b2a commit dda9847275da79ccbb2f0b7079b250e28b3b3b2a Author: John Baldwin AuthorDate: 2021-12-30 22:10:05 +0000 Commit: John Baldwin CommitDate: 2021-12-30 22:25:47 +0000 depend-cleanup.sh: Handle stale libc++.so ldscripts. libc++ was moved from /usr/lib to /lib, but the libc++.so linker script is not regenerated when the value of SHLIB changes. Reported by: cy --- tools/build/depend-cleanup.sh | 7 +++++++ 1 file changed, 7 insertions(+) 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