From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28E8A1382C5 for ; Wed, 7 Mar 2018 02:56:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29EABE0877; Wed, 7 Mar 2018 02:56:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECE95E0877 for ; Wed, 7 Mar 2018 02:56:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BABB335C3E for ; Wed, 7 Mar 2018 02:56:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBFD61EF for ; Wed, 7 Mar 2018 02:56:00 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1520391318.57d163547a20c63eb22f37c339e46f463fe4dc62.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-2.30.2.ebuild sys-apps/util-linux/util-linux-2.31-r1.ebuild sys-apps/util-linux/util-linux-2.31.1.ebuild sys-apps/util-linux/util-linux-2.32_rc2.ebuild sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 57d163547a20c63eb22f37c339e46f463fe4dc62 X-VCS-Branch: master Date: Wed, 7 Mar 2018 02:56:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a293f8b4-c92f-4c89-881b-fa7aabaf86f1 X-Archives-Hash: 3bae8e9538a7c680513ca87988480094 commit: 57d163547a20c63eb22f37c339e46f463fe4dc62 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Mar 7 02:54:55 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Mar 7 02:55:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d16354 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 sys-apps/util-linux/util-linux-2.30.2.ebuild | 11 +++++++++-- sys-apps/util-linux/util-linux-2.31-r1.ebuild | 13 ++++++++++--- sys-apps/util-linux/util-linux-2.31.1.ebuild | 13 ++++++++++--- sys-apps/util-linux/util-linux-2.32_rc2.ebuild | 11 +++++++++-- sys-apps/util-linux/util-linux-9999.ebuild | 11 +++++++++-- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild index 80a2fbe2a62..09c71996e90 100644 --- a/sys-apps/util-linux/util-linux-2.30.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.30.2.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() { diff --git a/sys-apps/util-linux/util-linux-2.31-r1.ebuild b/sys-apps/util-linux/util-linux-2.31-r1.ebuild index 963e973d277..db7274a9a61 100644 --- a/sys-apps/util-linux/util-linux-2.31-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.31-r1.ebuild @@ -6,14 +6,14 @@ 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}" if [[ ${PV} == 9999 ]] ; then inherit git-r3 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else [[ "${PV}" = *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" @@ -73,15 +73,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 } @@ -161,7 +168,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() { diff --git a/sys-apps/util-linux/util-linux-2.31.1.ebuild b/sys-apps/util-linux/util-linux-2.31.1.ebuild index ee5b6efcc21..41dd4c18eec 100644 --- a/sys-apps/util-linux/util-linux-2.31.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.31.1.ebuild @@ -6,14 +6,14 @@ 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}" if [[ ${PV} == 9999 ]] ; then inherit git-r3 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else [[ "${PV}" = *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" @@ -69,15 +69,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 } @@ -157,7 +164,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() { diff --git a/sys-apps/util-linux/util-linux-2.32_rc2.ebuild b/sys-apps/util-linux/util-linux-2.32_rc2.ebuild index 9b414fd08b9..a6b7310e742 100644 --- a/sys-apps/util-linux/util-linux-2.32_rc2.ebuild +++ b/sys-apps/util-linux/util-linux-2.32_rc2.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}" @@ -69,15 +69,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 } @@ -157,7 +164,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() { diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index fd77cb1a772..6fcbc94b078 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() {