[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Andreas K. Hüttel]

commit:     fedcbfbed423e21c79c2088f3776e918473fd814
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 19:05:35 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 19:06:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fedcbfbe

sys-libs/glibc: Add small locale install hack for riscv

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-libs/glibc/glibc-2.29-r2.ebuild | 11 +++++++++++
 sys-libs/glibc/glibc-9999.ebuild    | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild 
b/sys-libs/glibc/glibc-2.29-r2.ebuild
index 8f920eb85ac..c0f14491fe7 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -1262,6 +1262,17 @@ glibc_do_src_install() {
                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
+
        cd "${S}"
 
        # Install misc network config files

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index b01dc823635..4951020d519 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1263,6 +1263,17 @@ glibc_do_src_install() {
                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
+
        cd "${S}"
 
        # Install misc network config files