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

[Andreas Hüttel]

commit:     cf437375881c81020d86f374dfc93df55fe879ef
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 19:25:28 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 19:25:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf437375

sys-libs/glibc: Re-run sanity checks in src_unpack

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-libs/glibc/glibc-9999.ebuild | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a739da784a7..4e1724bb599 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -575,8 +575,8 @@ get_kheader_version() {
 }
 
 # We collect all sanity checks here. Consistency is not guranteed between
-# pkg_ and src_ phases, so we can call this function both in pkg_pretend
-# and in src_configure.
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
 sanity_prechecks() {
        # Make sure devpts is mounted correctly for use w/out setuid pt_chown
        check_devpts
@@ -706,12 +706,13 @@ pkg_pretend() {
        einfo "Checking general environment sanity."
        sanity_prechecks
 }
-# todo: shouldn't most of these checks be called also in src_configure again?
-# (since consistency is not guaranteed between pkg_ and src_)
 
 # src_unpack
 
 src_unpack() {
+       # Consistency is not guaranteed between pkg_ and src_ ...
+       sanity_prechecks
+
        use multilib && unpack 
gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
 
        setup_env
@@ -722,10 +723,10 @@ src_unpack() {
                unpack ${P}.tar.xz
        fi
 
-       cd "${S}"
-       touch locale/C-translit.h #185476 #218003
+       cd "${S}" || die
+       touch locale/C-translit.h || die #185476 #218003
 
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
 }