commit: 65bbc208974e82689206465dd8c6c7b2beefe64b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 10 07:24:08 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
