diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2023-01-07 16:43:57 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2023-01-10 22:46:11 +0000 |
| commit | fc216dbf67e3a1199e9f2643ffa1707ee056adff (patch) | |
| tree | 532800372f9a0469414c19bf742f9d8be54d9de9 /sys-libs/glibc/glibc-9999.ebuild | |
| parent | sci-mathematics/singular: add 4.3.1_p3, drop 4.3.1_p2 (diff) | |
| download | gentoo-fc216dbf67e3a1199e9f2643ffa1707ee056adff.tar.gz gentoo-fc216dbf67e3a1199e9f2643ffa1707ee056adff.tar.bz2 gentoo-fc216dbf67e3a1199e9f2643ffa1707ee056adff.zip | |
sys-libs/glibc: Fix automagic Perl dependency that breaks Prefix QA checks
/usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if Perl hasn't
been installed inside the prefix yet and configure picks up a Perl from outside
the prefix instead. With this change, configure will fail to execute Perl during
configure if we're cross-compiling a prefix, but it will just disable mtrace in
that case.
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'sys-libs/glibc/glibc-9999.ebuild')
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index f35acd536613..e205c7ea5425 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -43,7 +43,7 @@ SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )" -IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla" +IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla" # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" @@ -118,6 +118,7 @@ COMMON_DEPEND=" audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) + perl? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) @@ -1009,6 +1010,13 @@ glibc_do_configure() { $(use_enable systemtap) $(use_enable nscd) + # /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if + # Perl hasn't been installed inside the prefix yet and configure picks + # 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)" + # locale data is arch-independent # https://bugs.gentoo.org/753740 libc_cv_complocaledir='${exec_prefix}/lib/locale' |