From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +BE7JIB9x2AmbQAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 18:02:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IDvVH4B9x2CKSwAA1q6Kng (envelope-from ) for ; Mon, 14 Jun 2021 16:02:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A43B18314 for ; Mon, 14 Jun 2021 18:02:07 +0200 (CEST) Received: from localhost ([::1]:40948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp2M-0002cm-NQ for larch@yhetil.org; Mon, 14 Jun 2021 12:02:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog5-00038o-SS for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36076) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog5-0007lP-KH for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog5-0004Jp-Ie for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 29/37] glib: Use a correct python in scripts when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:05 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368514316549 (code B ref 49025); Mon, 14 Jun 2021 15:39:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:03 +0000 Received: from localhost ([127.0.0.1]:47607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofy-0004ID-Jw for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofw-0004AR-CA for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:56 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3ev2500X0mfAB4063ew7D; Mon, 14 Jun 2021 17:38:56 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:55 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-KoXuNUQJ6COvEDNZqeuQ" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685136; bh=XiQuYZveIJ8Rgxyv4aIZHjDU0wzSbBF/g7pC1SfJSRI=; h=Subject:From:To:Date:In-Reply-To:References; b=GtzJBWiu5ttlKxOPjLakC1XDko/JpnVb1A8x3XGjPndIMuvup2QsTUxRoVPYv/I+J DtiQ6vxhxDSRKUd/FE1o0VcarDgcf1IdKOJNUj9pjO3OuM0z6osNZAbYhA5zIRf7PX NE08p2EgEe08TXIudQ9/8uHnzoGHVELp42BhwHHYry07Fi/W5BFaS324y4kgLzj2AR ZWlBtfkUIx3wirwo7eBn6zZH04DwPLFRAq9Krn8Q/gutZwXagcFTNMl0HPrA8MYX2U s/aGUtsMQKhBDbDCVgezJ+kt35c1InSr2qkukapy2cpd7iY3eX+2bnnoWgDhrIi0gc lryl6adwIXYqg== 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623686527; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=XiQuYZveIJ8Rgxyv4aIZHjDU0wzSbBF/g7pC1SfJSRI=; b=OM9FEbCMhcFUK7ud59UO7ytTDS33+gX95xOofipbBMir7D4HDIl/HG9/CbIu6zGoMP9J0W Tn3UCYAU2DFQ7KW2WrfVMj3RpXJJoUVe8+rKlAUhlwJuTgc1+uhqRIXhSJ1vwt/ypffOVX crv41covWIcwPkQ07LupB0SA6dU8+sXbFQSsVLXj31lKDgYE/Yap2SFjaf2KJOMA/UMVvE FkJPV2bG4c6YBk28I2Ytcz/W8nSuALWbf5oH4sZJUAnG88loyeOxNrCsp01XhTI4MNLh09 L8idJtk5WN8L+CA02iBB8h9cinRRO9Jk4qt0ud0k4/FoCteBVr12dfg/tHEiCw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623686527; a=rsa-sha256; cv=none; b=Nq390tY3aZj/QRYPLAfmTrRL+ejcR6xTH3/sEZ/1HWZ0y8E3NQT2Nj4MzyiuV1JgI6OnXB R75PMm35kijnj+BH2JRekzFJ0yPTQ5a9eeT2yefN8THBtoWjKY23cpOmyJl55RL4h/i+dr 5avKaBXkv7Tr7/Fbm5i2B3yELMPpIF/VfVgkC/a1ntJSe9eAmzZuxs7xYaHRMkrx4aB0+b zIGd2dM1yd9ue8DFDIITxpKgDZBrF6ptxAdCxT1NiM99RWeMhUwy1/zIwTC8yBbz0uz6Rb wL/2CtrZjgHXJ2v05m5vgAG8HDWvlDaFUeY/2JG1yUEra23uWANKrVoqozqvbA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=GtzJBWiu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=GtzJBWiu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A43B18314 X-Spam-Score: -1.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: w7P9MVtPR1Ys --=-KoXuNUQJ6COvEDNZqeuQ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit During the build, a native python should be used as these scripts will be invoked during the build, but when installed, they should be a python for the system we're compiling for. * gnu/packages/glib.scm (glib)[arguments]<#:phases>{patch-python-references}: Look up "python" in 'native-inputs', not 'inputs'. (glib)[inputs]{python,python-wrapper,bash-minimal}: New inputs. --- gnu/packages/glib.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) --=-KoXuNUQJ6COvEDNZqeuQ Content-Disposition: attachment; filename="0029-glib-Use-a-correct-python-in-scripts-when-cross-comp.patch" Content-Transfer-Encoding: 8bit Content-Type: text/x-patch; name="0029-glib-Use-a-correct-python-in-scripts-when-cross-comp.patch"; charset="UTF-8" diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 94276ae0ef..25c5ae494b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Arthur Margerit +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,14 +223,19 @@ shared NFS home directories.") #t)) ;; Python references are not being patched in patch-phase of build, ;; despite using python-wrapper as input. So we patch them manually. + ;; + ;; These python scripts are both used during build and installed, + ;; so at first, use a python from 'native-inputs', not 'inputs'. When + ;; cross-compiling, the 'patch-shebangs' phase will replace + ;; the native python with a python from 'inputs'. (add-after 'unpack 'patch-python-references - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" "glib/gtester-report.in" "gobject/glib-genmarshal.in" "gobject/glib-mkenums.in") (("@PYTHON@") - (string-append (assoc-ref inputs "python") + (string-append (assoc-ref (or native-inputs inputs) "python") "/bin/python" ,(version-major+minor (package-version python))))) @@ -282,6 +288,13 @@ shared NFS home directories.") ("xsltproc" ,libxslt))) (inputs `(("bash-completion" ,bash-completion) + ;; "python", "python-wrapper" and "bash-minimal" + ;; are for the 'patch-shebangs' phase, to make + ;; sure the installed scripts end up with a correct shebang + ;; when cross-compiling. + ("python" ,python) + ("python-wrapper" ,python-wrapper) + ("bash-minimal" ,(canonical-package bash-minimal)) ("dbus" ,dbus) ("libelf" ,libelf))) (propagated-inputs --=-KoXuNUQJ6COvEDNZqeuQ--