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 9B35E138359 for ; Sun, 2 Aug 2020 17:37:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3388E0995; Sun, 2 Aug 2020 17:37:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 ABC91E0995 for ; Sun, 2 Aug 2020 17:37:31 +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 BF82234F325 for ; Sun, 2 Aug 2020 17:37:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 305A02CE for ; Sun, 2 Aug 2020 17:37:29 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1596389839.8f4fa093b0da0b3781bb84cadbb0e723bc3db958.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/criu/criu-3.14-r1.ebuild sys-process/criu/criu-3.14.ebuild X-VCS-Directories: sys-process/criu/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 8f4fa093b0da0b3781bb84cadbb0e723bc3db958 X-VCS-Branch: master Date: Sun, 2 Aug 2020 17:37:29 +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: a481a467-2b6e-429e-aad1-9dcc53bf8e65 X-Archives-Hash: 1aa98db082150f154cac1b6273b6a859 commit: 8f4fa093b0da0b3781bb84cadbb0e723bc3db958 Author: Patrick McLean gentoo org> AuthorDate: Sun Aug 2 17:37:04 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Sun Aug 2 17:37:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4fa093 sys-process/criu-3.14-r1: Don't install python2.7 code (bug 723872) Closes: https://bugs.gentoo.org/723872 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Patrick McLean gentoo.org> sys-process/criu/{criu-3.14.ebuild => criu-3.14-r1.ebuild} | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys-process/criu/criu-3.14.ebuild b/sys-process/criu/criu-3.14-r1.ebuild similarity index 94% rename from sys-process/criu/criu-3.14.ebuild rename to sys-process/criu/criu-3.14-r1.ebuild index 9ffb3cc47e9..c9f8ef9a81c 100644 --- a/sys-process/criu/criu-3.14.ebuild +++ b/sys-process/criu/criu-3.14-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..8} ) inherit toolchain-funcs linux-info flag-o-matic python-r1 @@ -75,6 +75,7 @@ src_configure() { # Gold linker generates invalid object file when used with criu's custom # linker script. Use the bfd linker instead. See https://crbug.com/839665#c3 tc-ld-disable-gold + python_setup } src_compile() { @@ -84,6 +85,8 @@ src_compile() { CC="$(tc-getCC)" \ LD="$(tc-getLD)" \ AR="$(tc-getAR)" \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ OBJCOPY="$(tc-getOBJCOPY)" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ ARCH="$(criu_arch)" \ @@ -109,6 +112,8 @@ src_install() { emake \ ARCH="$(criu_arch)" \ PREFIX="${EPREFIX}"/usr \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ DESTDIR="${D}" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \