From patchwork Fri Apr 28 14:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cully X-Patchwork-Id: 49656 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6916027BBEA; Fri, 28 Apr 2023 15:06:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C271027BBE2 for ; Fri, 28 Apr 2023 15:06:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psOjd-0002CF-Ez; Fri, 28 Apr 2023 10:06:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psOjb-0002C2-CV for guix-patches@gnu.org; Fri, 28 Apr 2023 10:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psOja-0002ES-JY for guix-patches@gnu.org; Fri, 28 Apr 2023 10:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psOja-00020B-BF for guix-patches@gnu.org; Fri, 28 Apr 2023 10:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63149] [PATCH] gnu: criu: Fix build Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 14:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63149@debbugs.gnu.org Cc: Brian Cully X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16826907117608 (code B ref -1); Fri, 28 Apr 2023 14:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 14:05:11 +0000 Received: from localhost ([127.0.0.1]:34083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOik-0001ye-KT for submit@debbugs.gnu.org; Fri, 28 Apr 2023 10:05:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:60386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOii-0001yV-5C for submit@debbugs.gnu.org; Fri, 28 Apr 2023 10:05:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psOih-0001oe-OE for guix-patches@gnu.org; Fri, 28 Apr 2023 10:05:07 -0400 Received: from coleridge.kublai.com ([166.84.7.167] helo=mail.spork.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psOig-0001lP-8k for guix-patches@gnu.org; Fri, 28 Apr 2023 10:05:07 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 627C290CD; Fri, 28 Apr 2023 10:04:28 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1682690668; bh=BsJzBi1xhkLnzJkXy46CBYdOzj4FjgM4bP/DkTyvFY8=; h=From:To:Cc:Subject:Date; b=o+IExSQqdaWTiekAGqBSkVdKmUtjwItHecU1RpugqLq4w0PjbImmBEQtZmz75RAam Z0phvvlbR+E+sIpvH4/l1BUHzn6l5DoMAQEs8qlA0ERftKyYTYdaS0RNcRdu9XHXps qrcPKtpeZgHtmUCTtGTdCJtvt5gaauF+E+1YRibg= Date: Fri, 28 Apr 2023 10:04:25 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=166.84.7.167; envelope-from=bjc@spork.org; helo=mail.spork.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches X-Patchwork-Original-From: Brian Cully via Guix-patches via From: Brian Cully Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Use python-toolchain explicitly in order to pull in our patched ZipFile creation which ignores timestamp. * gnu/packages/virtualization.scm (criu) [native-inputs]: Add python-toolchain. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4a0d6b0096..d9fc8108dc 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1748,7 +1748,6 @@ (define-public criu (for-each delete-file (find-files out "\\.a$")))))))) (inputs `(("protobuf" ,protobuf) - ("python" ,python) ("python-protobuf" ,python-protobuf) ("iproute" ,iproute) ("libaio" ,libaio) @@ -1763,7 +1762,8 @@ (define-public criu asciidoc xmlto docbook-xml - docbook-xsl)) + docbook-xsl + python-toolchain)) (propagated-inputs ;; included by 'rpc.pb-c.h' (list protobuf-c))