From cf437375881c81020d86f374dfc93df55fe879ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 20 Jan 2018 20:25:28 +0100 Subject: [PATCH] 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 a739da784a7e..4e1724bb5992 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 } -- 2.26.2