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 837D7138359 for ; Tue, 18 Aug 2020 08:04:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67869E0885; Tue, 18 Aug 2020 08:04:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 42A85E0880 for ; Tue, 18 Aug 2020 08:04:03 +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 DDF8634F3F0 for ; Tue, 18 Aug 2020 08:04:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50A31315 for ; Tue, 18 Aug 2020 08:04:00 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1597737834.a2cb4f6a8da80865a65bbebd5cf749e4cab8ae62.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python/python-3.6.11-r2.ebuild dev-lang/python/python-3.7.8-r2.ebuild dev-lang/python/python-3.8.5.ebuild dev-lang/python/python-3.9.0_rc1.ebuild X-VCS-Directories: dev-lang/python/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a2cb4f6a8da80865a65bbebd5cf749e4cab8ae62 X-VCS-Branch: master Date: Tue, 18 Aug 2020 08:04: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e9fbfa19-cfff-43f5-9952-96a930a22350 X-Archives-Hash: 099fee9db58b6b2328a2ed8e32f92a79 commit: a2cb4f6a8da80865a65bbebd5cf749e4cab8ae62 Author: Michał Górny gentoo org> AuthorDate: Tue Aug 18 07:54:48 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Aug 18 08:03:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2cb4f6a dev-lang/python: Respect MAKEOPTS throughout the build Closes: https://bugs.gentoo.org/737660 Signed-off-by: Michał Górny gentoo.org> dev-lang/python/python-3.6.11-r2.ebuild | 14 +++++++++++--- dev-lang/python/python-3.7.8-r2.ebuild | 14 +++++++++++--- dev-lang/python/python-3.8.5.ebuild | 15 ++++++++++++--- dev-lang/python/python-3.9.0_rc1.ebuild | 16 ++++++++++++---- 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dev-lang/python/python-3.6.11-r2.ebuild b/dev-lang/python/python-3.6.11-r2.ebuild index 1fb0d08c949..ea7d7c2ab71 100644 --- a/dev-lang/python/python-3.6.11-r2.ebuild +++ b/dev-lang/python/python-3.6.11-r2.ebuild @@ -4,7 +4,8 @@ EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs MY_P="Python-${PV}" PYVER=$(ver_cut 1-2) @@ -81,6 +82,11 @@ src_prepare() { configure.ac \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } @@ -193,10 +199,12 @@ src_test() { # bug 660358 local -x COLUMNS=80 - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do diff --git a/dev-lang/python/python-3.7.8-r2.ebuild b/dev-lang/python/python-3.7.8-r2.ebuild index a2b8b787199..0daef877b50 100644 --- a/dev-lang/python/python-3.7.8-r2.ebuild +++ b/dev-lang/python/python-3.7.8-r2.ebuild @@ -4,7 +4,8 @@ EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs MY_P="Python-${PV}" PYVER=$(ver_cut 1-2) @@ -73,6 +74,11 @@ src_prepare() { sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } @@ -180,10 +186,12 @@ src_test() { # bug 660358 local -x COLUMNS=80 - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do diff --git a/dev-lang/python/python-3.8.5.ebuild b/dev-lang/python/python-3.8.5.ebuild index c2a10d03855..df05aaedef1 100644 --- a/dev-lang/python/python-3.8.5.ebuild +++ b/dev-lang/python/python-3.8.5.ebuild @@ -4,7 +4,8 @@ EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs MY_P="Python-${PV}" PYVER=$(ver_cut 1-2) @@ -73,6 +74,12 @@ src_prepare() { sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } @@ -185,10 +192,12 @@ src_test() { # bug 660358 local -x COLUMNS=80 - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do diff --git a/dev-lang/python/python-3.9.0_rc1.ebuild b/dev-lang/python/python-3.9.0_rc1.ebuild index 461adca3a23..6bf6b905d71 100644 --- a/dev-lang/python/python-3.9.0_rc1.ebuild +++ b/dev-lang/python/python-3.9.0_rc1.ebuild @@ -4,8 +4,8 @@ EAPI="7" WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \ - toolchain-funcs +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs MY_P="Python-${PV/_/}" PYVER=$(ver_cut 1-2) @@ -85,6 +85,12 @@ src_prepare() { sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } @@ -197,10 +203,12 @@ src_test() { # bug 660358 local -x COLUMNS=80 - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do