[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/
Date: Tue, 22 Sep 2020 20:25:03 +0000 (UTC)	[thread overview]
Message-ID: <1600806263.1db39caa60172f86d9f2c1d248e26c87f7ce5676.gyakovlev@gentoo> (raw)

commit:     1db39caa60172f86d9f2c1d248e26c87f7ce5676
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 08:29:20 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 20:24:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db39caa

sys-process/criu: revbump 3.14-r1, python no longer optional

python is no longer optional, criu target
requires crit, which requires pycriu.

also check for IA32 emulation only on amd64.

and remove RAW_LDFLAGS, it was added by patch
which is no longer applied to this version.
LDFLAGS still not honored, #728148

Closes: https://bugs.gentoo.org/735636
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../{criu-3.14-r1.ebuild => criu-3.14-r2.ebuild}   | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys-process/criu/criu-3.14-r1.ebuild b/sys-process/criu/criu-3.14-r2.ebuild
similarity index 85%
rename from sys-process/criu/criu-3.14-r1.ebuild
rename to sys-process/criu/criu-3.14-r2.ebuild
index 17298a55f2c..0cab02a8774 100644
--- a/sys-process/criu/criu-3.14-r1.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -14,16 +14,16 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="doc python selinux setproctitle static-libs"
+IUSE="doc selinux setproctitle static-libs"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/protobuf-c
 	dev-libs/libnl:3
 	net-libs/libnet:1.1
 	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
 	selinux? ( sys-libs/libselinux )
 	setproctitle? ( dev-libs/libbsd )"
 DEPEND="${RDEPEND}
@@ -32,14 +32,12 @@ DEPEND="${RDEPEND}
 		app-text/xmlto
 	)"
 RDEPEND="${RDEPEND}
-	python? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+"
 
 CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
-	~NETFILTER_XT_MARK"
+	~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK"
 
 # root access required for tests
 RESTRICT="test"
@@ -60,6 +58,11 @@ criu_arch() {
 	esac
 }
 
+pkg_setup() {
+	use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+	linux-info_pkg_setup
+}
+
 src_prepare() {
 	default
 
@@ -81,7 +84,7 @@ src_configure() {
 
 src_compile() {
 	local target="all $(usex doc 'docs' '')"
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
+	emake \
 		HOSTCC="$(tc-getBUILD_CC)" \
 		CC="$(tc-getCC)" \
 		LD="$(tc-getLD)" \
@@ -93,7 +96,6 @@ src_compile() {
 		ARCH="$(criu_arch)" \
 		V=1 WERROR=0 DEBUG=0 \
 		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
 		${target}
 }
 
@@ -123,9 +125,7 @@ src_install() {
 
 	use doc && dodoc CREDITS README.md
 
-	if use python ; then
-		python_foreach_impl install_crit
-	fi
+	python_foreach_impl install_crit
 
 	if ! use static-libs; then
 		find "${D}" -name "*.a" -delete || die

next             reply	other threads:[~2020-09-22 20:25 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-22 20:25 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-05  9:35 [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/ Jakov Smolić
2025-06-21 16:10 Arthur Zamarin
2025-06-21 15:31 Arthur Zamarin
2024-08-22  8:55 WANG Xuerui
2024-08-22  8:55 WANG Xuerui
2024-04-29 10:36 Joonas Niilola
2024-01-21 15:15 Florian Schmaus
2024-01-21 14:52 Florian Schmaus
2024-01-21  9:44 Florian Schmaus
2023-07-08  3:39 Sam James
2023-07-07  4:40 Sam James
2023-07-07  3:36 Sam James
2023-05-01 12:52 Sam James
2023-02-25 12:48 Joonas Niilola
2022-11-15 18:22 Michał Górny
2022-11-03  6:15 Sam James
2022-11-03  6:15 Sam James
2022-11-02 23:14 Sam James
2022-07-03 23:54 Sam James
2022-06-07  8:24 Jakov Smolić
2022-06-07  6:34 Joonas Niilola
2022-06-03  8:12 Sam James
2022-06-03  6:58 Sam James
2022-03-25  9:46 Jakov Smolić
2022-03-25  4:23 Sam James
2022-02-02 20:52 Arthur Zamarin
2022-02-02  8:02 Agostino Sarubbo
2021-09-03  1:53 Sam James
2021-07-20  0:51 Georgy Yakovlev
2021-06-01  6:32 Agostino Sarubbo
2020-11-25  3:45 Patrick McLean
2020-09-25  8:45 Agostino Sarubbo
2020-09-24  8:29 Georgy Yakovlev
2020-09-24  1:53 Georgy Yakovlev
2020-09-22 20:25 Georgy Yakovlev
2020-08-02 17:37 Patrick McLean
2020-05-15 17:36 Patrick McLean
2019-12-29  9:56 David Seifert
2019-10-20  6:29 Yixun Lan
2019-07-28 19:39 Matthias Maier
2019-07-28 19:39 Matthias Maier
2019-03-02  9:57 Sergei Trofimovich
2019-01-12 23:29 Sergei Trofimovich
2019-01-12 23:29 Sergei Trofimovich
2018-05-07  6:38 Mike Frysinger
2018-04-30 15:58 Mike Gilbert
2018-02-22  9:05 Agostino Sarubbo
2018-02-12  3:05 Matthias Maier
2018-02-12  3:05 Matthias Maier
2018-01-22  1:42 Zac Medico
2017-12-16  0:24 Matthias Maier
2017-11-12 21:08 Justin Lecher
2017-09-21 21:06 Mike Gilbert
2017-05-26 22:54 David Seifert
2017-03-30  6:32 Yixun Lan
2017-03-10  7:49 Yixun Lan
2017-03-10  7:49 Yixun Lan
2017-02-22  9:08 Yixun Lan
2017-02-15 21:45 Yixun Lan
2017-01-19  1:47 Yixun Lan
2016-12-20 19:21 Tobias Klausmann
2016-10-18 20:49 Yixun Lan
2016-10-18 20:49 Yixun Lan
2016-09-20  6:35 Yixun Lan
2016-09-20  6:35 Yixun Lan
2016-07-04 19:05 Stephen Klimaszewski
2016-05-27  9:33 Lars Wendler
2016-03-21  6:15 Yixun Lan
2016-03-15 15:13 Alexis Ballier
2016-03-15 15:13 Alexis Ballier
2015-08-19  6:53 Yixun Lan

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:17298a55f2 dfblob:0cab02a877 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1600806263.1db39caa60172f86d9f2c1d248e26c87f7ce5676.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox