From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AHpyNtLGzGAfQwAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 18:16:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wJ9AMtLGzGBuGgAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 16:16:18 +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 9891410E68 for ; Fri, 18 Jun 2021 18:16:18 +0200 (CEST) Received: from localhost ([::1]:53434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luHAH-00031q-Jr for larch@yhetil.org; Fri, 18 Jun 2021 12:16:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5L-0000aZ-Sf for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5L-0002Ao-LV for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5L-00030C-HY for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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: Fri, 18 Jun 2021 16:11:11 +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.162403264711278 (code B ref 49025); Fri, 18 Jun 2021 16:11:11 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:47 +0000 Received: from localhost ([127.0.0.1]:57809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4w-0002vj-OL for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:47 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4b-0002qa-0X for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:25 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAQPc; Fri, 18 Jun 2021 18:10:24 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:28 +0200 Message-Id: <20210618160936.18972-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032624; bh=lCJWeyObrNhygznWt8O1GFxQ1qcJ7GORkrjP1mPEuYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=k9HaUHOOh1AmPtvpJb3KypOcE6IelfheASKjXjLWHyJOI5I6nugSNd3mbDuNkgcJV PhnT5GO6K939pOYX4Mc7jphxr5OR0kYXHmlsOjyTRo2Otq6UCwi0oNGP3DXJPEHKZ8 K3GP/8VRKUNKa4Nlp/ziz9IxPaHgjlL5cphlyh7+9ZZryf9zR6ZXZedZIU+dA0SUc+ Ld+rjRG1lKjgs4YCtJKCi/2ChIvykCsMUYOihrEpePvf2cAdAjWLULmS43kyAbH5MS wxDsPdE78JmGxMIhNPZBH3Mqio+U/tzKPDZHTtCLc8GosLhcFhH9eZxfEIzqON6ckz CAh7RG9qpBJIw== 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+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=1624032978; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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=lCJWeyObrNhygznWt8O1GFxQ1qcJ7GORkrjP1mPEuYY=; b=jSFXGpghAA+IRzBqiXA0b3LCzukBd57G5KdilSyJKuRVYB0rri9onqMwnwpI5psOLMByFy UMImFy+csFyn1aKVh0Gn3+wNHFVRafAbdNu96GJtQqvq8qM4Eh1JktTTxJv2DiBeTCztkh P9t/22sc3m85mMtxtyuaCd/EocJz9Ah1j9JETw7MgOE0a1XuePyCRG0y1w0oFmYeQWF50/ Skdlz1MUC7qRsZQ0QHRdgxhGZBMqpT2USldGaPwuo/r36wQqb1v9hrdIKm1k6UEczG5Iuu U+uca5Wp3xowg21cTKF91OPO77SeHxqpBZjBrkDYo91qEyBGeWnBi3ApvPbbcg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624032978; a=rsa-sha256; cv=none; b=C+GlUJOJOGix72W1WZR9nYJXLTL1UYdaek0iPWrCcfm6ZGb3vOSj6jSzKT3gMkCP6HZoqQ hVvLqFUYT/XcN98rxy8ERxi5zXYZd6cewOIR4aMKc9hGaHt+7+QynLYA7EVaMoSSTOkUxZ BS732u55XDrNw7gQPlst6GW1plRdMQb5W0FHV2SGkTcE587JWs4FTJxLc1OiqHNgV/5iKl kA947meNSrazzCTPgE4WCFlMlNvMofctZPT8lhemtve4H/WJKc5TlH+/aR0DrFjo4YXRXz 5GptOJVpFRa71c7ns6MGSxpuQTLwI+frMt4m92eIn2CWa+ufvGn9gZKIuXffEw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=k9HaUHOO; 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.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=k9HaUHOO; 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: 9891410E68 X-Spam-Score: 1.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: m0TyzQeHga3e 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(-) 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 -- 2.32.0