From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA784158086 for ; Wed, 29 Dec 2021 19:31:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C52CF2BC016; Wed, 29 Dec 2021 19:31:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0938C2BC016 for ; Wed, 29 Dec 2021 19:31:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 786F1342AA4 for ; Wed, 29 Dec 2021 19:31:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AA311BF for ; Wed, 29 Dec 2021 19:31:20 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1640806269.3f74b59c3c9aaecadddf9625f1e38086565f7bc6.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.34-r4.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 3f74b59c3c9aaecadddf9625f1e38086565f7bc6 X-VCS-Branch: master Date: Wed, 29 Dec 2021 19:31:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c98d384-675d-4f0a-8187-46ed4852d2a9 X-Archives-Hash: 226c61f4b44b8f59b2718a815babbdec commit: 3f74b59c3c9aaecadddf9625f1e38086565f7bc6 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Dec 29 19:29:05 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Dec 29 19:31:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f74b59c sys-libs/glibc: Bugfix, against false errors in last minute run test If there is a ld.so in a subdirectory of the libdir, it might have been picked first ... Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas K. Huettel gentoo.org> sys-libs/glibc/glibc-2.34-r4.ebuild | 2 +- sys-libs/glibc/glibc-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/glibc/glibc-2.34-r4.ebuild b/sys-libs/glibc/glibc-2.34-r4.ebuild index 4346f19004c8..88f72ad1d7db 100644 --- a/sys-libs/glibc/glibc-2.34-r4.ebuild +++ b/sys-libs/glibc/glibc-2.34-r4.ebuild @@ -1546,7 +1546,7 @@ glibc_sanity_check() { # first let's find the actual dynamic linker here # symlinks may point to the wrong abi - local newldso=$(find . -name 'ld*so.?' -type f -print -quit) + local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit) einfo Last-minute run tests with ${newldso} in /$(get_libdir) ... diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 2cb4bf86808c..19d0bf001397 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1539,7 +1539,7 @@ glibc_sanity_check() { # first let's find the actual dynamic linker here # symlinks may point to the wrong abi - local newldso=$(find . -name 'ld*so.?' -type f -print -quit) + local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit) einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...