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 3219C15802F for ; Fri, 10 Mar 2023 07:25:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61D91E086D; Fri, 10 Mar 2023 07:25:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 04B2AE086D for ; Fri, 10 Mar 2023 07:25:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 08BF833BF3C for ; Fri, 10 Mar 2023 07:25:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B30D896 for ; Fri, 10 Mar 2023 07:25:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678433096.65bbc208974e82689206465dd8c6c7b2beefe64b.sam@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.36-r6.ebuild sys-libs/glibc/glibc-2.36-r7.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 65bbc208974e82689206465dd8c6c7b2beefe64b X-VCS-Branch: master Date: Fri, 10 Mar 2023 07:25:12 +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: 4393045a-baec-495e-a70b-55162833ba51 X-Archives-Hash: 76610cbc23d2c9f1d8a205c4bae1ce61 commit: 65bbc208974e82689206465dd8c6c7b2beefe64b Author: Sam James gentoo org> AuthorDate: Fri Mar 10 07:24:08 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 10 07:24:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bbc208 sys-libs/glibc: backport perl/mtrace test fixes from 2.37 to 2.36 Closes: https://bugs.gentoo.org/895318 Closes: https://bugs.gentoo.org/900639 See: 805a7923d1d845587bd38ea90808e605fbc2f1d6 See: 8bc459b38f9cdfa980e7fc6257b95cf08dbd2973 Signed-off-by: Sam James gentoo.org> sys-libs/glibc/glibc-2.36-r6.ebuild | 5 ++++- sys-libs/glibc/glibc-2.36-r7.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-libs/glibc/glibc-2.36-r6.ebuild b/sys-libs/glibc/glibc-2.36-r6.ebuild index e86bbd923123..d2e3e438e4a2 100644 --- a/sys-libs/glibc/glibc-2.36-r6.ebuild +++ b/sys-libs/glibc/glibc-2.36-r6.ebuild @@ -111,6 +111,7 @@ BDEPEND=" sys-apps/grep app-alternatives/awk ) + test? ( dev-lang/perl ) " COMMON_DEPEND=" gd? ( media-libs/gd:2= ) @@ -119,6 +120,7 @@ COMMON_DEPEND=" caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) + test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) @@ -1015,7 +1017,8 @@ glibc_do_configure() { # up a Perl from outside the prefix instead. configure will fail to # execute Perl during configure if we're cross-compiling a prefix, but # it will just disable mtrace in that case. - ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl no)" + # Note: mtrace is needed by the test suite. + ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))" # locale data is arch-independent # https://bugs.gentoo.org/753740 diff --git a/sys-libs/glibc/glibc-2.36-r7.ebuild b/sys-libs/glibc/glibc-2.36-r7.ebuild index 4d0fecf5932c..c0b4734c003a 100644 --- a/sys-libs/glibc/glibc-2.36-r7.ebuild +++ b/sys-libs/glibc/glibc-2.36-r7.ebuild @@ -111,6 +111,7 @@ BDEPEND=" sys-apps/grep app-alternatives/awk ) + test? ( dev-lang/perl ) " COMMON_DEPEND=" gd? ( media-libs/gd:2= ) @@ -119,6 +120,7 @@ COMMON_DEPEND=" caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) + test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) @@ -1018,7 +1020,8 @@ glibc_do_configure() { # up a Perl from outside the prefix instead. configure will fail to # execute Perl during configure if we're cross-compiling a prefix, but # it will just disable mtrace in that case. - ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl no)" + # Note: mtrace is needed by the test suite. + ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))" # locale data is arch-independent # https://bugs.gentoo.org/753740