diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /sys-libs/glibc/glibc-9999.ebuild | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'sys-libs/glibc/glibc-9999.ebuild')
-rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 4caa8e76b1b1..c424c7a6b9bd 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -89,11 +89,19 @@ fi # and that gcc already contains the hardened patches. # Lastly, let's avoid some openssh nastiness, bug 708224, as # convenience to our users. + +# gzip, grep, awk are needed by locale-gen, bug 740750 + BDEPEND=" ${PYTHON_DEPS} >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) + !compile-locales? ( + app-arch/gzip + sys-apps/grep + virtual/awk + ) " COMMON_DEPEND=" gd? ( media-libs/gd:2= ) @@ -107,9 +115,17 @@ COMMON_DEPEND=" !<net-misc/openssh-8.1_p1-r2 " DEPEND="${COMMON_DEPEND} + compile-locales? ( + app-arch/gzip + sys-apps/grep + virtual/awk + ) test? ( >=net-dns/libidn2-2.3.0 ) " RDEPEND="${COMMON_DEPEND} + app-arch/gzip + sys-apps/grep + virtual/awk sys-apps/gentoo-functions " @@ -927,6 +943,11 @@ glibc_do_configure() { $(use_enable static-pie) $(use_enable systemtap) $(use_enable nscd) + + # locale data is arch-independent + # https://bugs.gentoo.org/753740 + libc_cv_complocaledir='${exec_prefix}/lib/locale' + ${EXTRA_ECONF} ) @@ -1312,26 +1333,7 @@ glibc_do_src_install() { insinto /etc doins locale.gen - # Make sure all the ABI's can find the locales and so we only - # have to generate one set - local a - keepdir /usr/$(get_libdir)/locale - for a in $(get_install_abis) ; do - if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then - dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale - fi - done - - # HACK: If we're building for riscv, we need to additionally make sure that - # we can find the locale archive afterwards - case ${CTARGET} in - riscv*) - if [[ ! -e ${ED}/usr/lib/locale ]] ; then - dosym ../$(get_libdir)/locale /usr/lib/locale - fi - ;; - *) ;; - esac + keepdir /usr/lib/locale cd "${S}" @@ -1458,6 +1460,12 @@ pkg_preinst() { [[ -n ${ROOT} ]] && return 0 [[ -d ${ED}/$(get_libdir) ]] || return 0 [[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check + + if [[ -L ${EROOT}/usr/lib/locale ]]; then + # Help portage migrate this to a directory + # https://bugs.gentoo.org/753740 + rm "${EROOT}"/usr/lib/locale || die + fi } pkg_postinst() { |