From patchwork Sun Jul 11 11:47:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 31295 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 3D46327BC83; Sun, 11 Jul 2021 12:49:41 +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 13A1D27BC81 for ; Sun, 11 Jul 2021 12:49:41 +0100 (BST) Received: from localhost ([::1]:52142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2Xxs-0005zR-5x for patchwork@mira.cbaines.net; Sun, 11 Jul 2021 07:49:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2XxM-0004F8-Cw for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2XxM-0008M4-2t for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2XxM-00075F-2E for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v5 17/20] 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: Sun, 11 Jul 2021 11:49:08 +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: Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162600409727033 (code B ref 49025); Sun, 11 Jul 2021 11:49:08 +0000 Received: (at 49025) by debbugs.gnu.org; 11 Jul 2021 11:48:17 +0000 Received: from localhost ([127.0.0.1]:34072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwW-00071r-LU for submit@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:16 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:38508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwM-0006y5-QW for 49025@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:07 -0400 Received: from localhost.localdomain ([213.119.242.127]) by xavier.telenet-ops.be with bizsmtp id Tnno2500V2ldwth01no6sd; Sun, 11 Jul 2021 13:48:06 +0200 From: Maxime Devos Date: Sun, 11 Jul 2021 13:47:20 +0200 Message-Id: <20210711114723.27568-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210711114723.27568-1-maximedevos@telenet.be> References: <419215938396207999184dafa43afaed6d7a0715.camel@telenet.be> <20210711114723.27568-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1626004086; bh=EdavLGCsmRKElVg3FWy+Yzt6MfN1A72DGpe66SV+JdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mR5I4F7/won+Ilqy6aNN5UnRIj7puBRbmdBxZ/2AfIz8raoEHZhaPyvewk5ehti0L fn4FF+N6PxWG9DRA6rYuzcGaGp7xByiv0ecZbQ8/JmfdTGD2N0EqduH25vKCWUfBWz myLIcrFhpUWTq6Ctg+4IA/s1DmXIRkfCT4R1cvllE/cAeFSCrRNh38oJP2W5FXg7yC i/bL5NP0tUsUj7DjMicYFMDJYZxDsEjK5P4ZRgI4GFQp3EcCx0qBvWAZtOeHijq1b9 K4Ad9Uihcsh7MgsI+phZLVvv1h3BrlEPG5jxqHEm2szzxKNqzOJ1qgbm8jUry/J5Jb hSQL3H4QOnMNw== 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: , 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 99f5c5d450..e4ebed7e2c 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.") "static" ;static libraries "bin")) ;executables; 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 '("--default-library=both" "-Dman=true" "-Dselinux=disabled")