From patchwork Fri Jun 18 17:16:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30444 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 BE54727BC83; Fri, 18 Jun 2021 18:23:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 833A027BC78 for ; Fri, 18 Jun 2021 18:23:04 +0100 (BST) Received: from localhost ([::1]:56574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICt-0004Tt-KJ for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:23:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAC-00087H-R6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAC-0004Im-HF for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAC-0004v6-Dm for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 30/37] glib: Verify the cross-compiled python is used in installed scripts. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403679518619 (code B ref 49025); Fri, 18 Jun 2021 17:20:16 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:55 +0000 Received: from localhost ([127.0.0.1]:58072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9r-0004q9-0C for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:55 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9F-0004jA-LN for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKHe1; Fri, 18 Jun 2021 19:19:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:24 +0200 Message-Id: <20210618171631.20534-30-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036757; bh=giAeuQfjk3falpP+LZZcVxXeFPnS4KkQbVcp7Utdx7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=DMyZSUzQL2FVMttMTiwFDeayL005AG2h0BubsgPFfvkKVP+K++Sdns6eeumFnDIpz 7jM8jr+I1g+3+hmk4HME8kO4ykqo/9pUrkBYqoaYxGmQUw6Csg5wnYUlPCeIE/c3i1 cOuoYAlK5P3dO6I45KtWsmkAwHZVvN5OJb/nPpQhmMYLeEgJRpOSmSmE/y3BjK7Ryg jR0WzSdCkDXqCQCdqVEd4H6Q+/HcEMfNFKMcl4lKeVHGFCkeXTR4vpHGmggTSz5/oZ kD+xXJBXcBSqrZZ/U6DdQHhWagK4MUvig0PoCy9JHJJaV1Fwd/5tbNNKJZggC2hf4g TBiO9FbguGzwQ== 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: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (glib)[arguments]<#:disallowed-references>: Disallow the native python when cross-compiling. --- gnu/packages/glib.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 25c5ae494b..244544ea6f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -77,6 +77,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) + #:use-module (srfi srfi-26) #:use-module ((srfi srfi-1) #:hide (zip)) ;; Export variables up-front to allow circular dependency with the 'xorg' @@ -200,7 +202,15 @@ shared NFS home directories.") (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python (arguments - `(#:disallowed-references (,tzdata-for-tests) + `(#:disallowed-references + (,tzdata-for-tests + ;; Verify glib-mkenums, gtester, ... use the cross-compiled + ;; python. + ,@(if (%current-target-system) + (map (cut gexp-input <> #:native? #t) + `(,(this-package-native-input "python") + ,(this-package-native-input "python-wrapper"))) + '())) #:configure-flags '("-Dman=true" "-Dselinux=disabled") #:phases