diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-03-07 03:54:55 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-03-07 03:55:18 +0100 |
| commit | 57d163547a20c63eb22f37c339e46f463fe4dc62 (patch) | |
| tree | cdb9b5fa3e09a62ceccadba35ca9fe73f2a21cf0 /sys-apps/util-linux/util-linux-9999.ebuild | |
| parent | dev-perl/Test-Version: Bump to version 2.70.0 (diff) | |
| download | gentoo-57d163547a20c63eb22f37c339e46f463fe4dc62.tar.gz gentoo-57d163547a20c63eb22f37c339e46f463fe4dc62.tar.bz2 gentoo-57d163547a20c63eb22f37c339e46f463fe4dc62.zip | |
sys-apps/util-linux: Make tests honor MAKEOPTS; Fix uuidd test
Closes: https://bugs.gentoo.org/593304
Closes: https://bugs.gentoo.org/649590
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sys-apps/util-linux/util-linux-9999.ebuild')
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index fd77cb1a7723..6fcbc94b0787 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-single-r1 multilib-minimal systemd + pam python-single-r1 multilib-minimal multiprocessing systemd MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -68,15 +68,22 @@ pkg_setup() { src_prepare() { default + # Prevent uuidd test failure due to socket path limit. #593304 + sed -i \ + -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ + tests/ts/uuid/uuidd || die "Failed to fix uuidd test" + if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf fi + # Undo bad ncurses handling by upstream. #601530 sed -i -E \ -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ configure || die + elibtoolize } @@ -156,7 +163,7 @@ multilib_src_compile() { } multilib_src_test() { - multilib_is_native_abi && emake check + multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" } multilib_src_install() { |