summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2020-08-02 10:37:04 -0700
committerPatrick McLean <chutzpah@gentoo.org>2020-08-02 10:37:19 -0700
commit8f4fa093b0da0b3781bb84cadbb0e723bc3db958 (patch)
tree9bd2896fcbcf2eb0f6b18d8be90fba6f59dbb90b
parentdev-libs/libmspack: bump to 0.10.1_alpha (diff)
downloadgentoo-8f4fa093b0da0b3781bb84cadbb0e723bc3db958.tar.gz
gentoo-8f4fa093b0da0b3781bb84cadbb0e723bc3db958.tar.bz2
gentoo-8f4fa093b0da0b3781bb84cadbb0e723bc3db958.zip
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 <chutzpah@gentoo.org>
-rw-r--r--sys-process/criu/criu-3.14-r1.ebuild (renamed from sys-process/criu/criu-3.14.ebuild)7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys-process/criu/criu-3.14.ebuild b/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)" \