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 Fhu7FTzWzGB4ZAAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:22:04 +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 KEyoEDzWzGAMTAAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 17:22:04 +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 D16B513725 for ; Fri, 18 Jun 2021 19:22:03 +0200 (CEST) Received: from localhost ([::1]:52748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBu-0001nu-OG for larch@yhetil.org; Fri, 18 Jun 2021 13:22:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAB-00081b-3h for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAA-0004HB-OT for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAA-0004uc-K9 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 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 17:20:14 +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.162403679418590 (code B ref 49025); Fri, 18 Jun 2021 17:20:14 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:54 +0000 Received: from localhost ([127.0.0.1]:58064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9p-0004pf-ME for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:53 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9F-0004j9-8c 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 JhK5250094e8Tal01hKGdn; Fri, 18 Jun 2021 19:19:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:23 +0200 Message-Id: <20210618171631.20534-29-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 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=1624036757; bh=lCJWeyObrNhygznWt8O1GFxQ1qcJ7GORkrjP1mPEuYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=SpaKT6pID5BTdRcY3GZkhUOTM1baVNsI+qzPuVw8gQYNEf0RZ46eAIrDjqV5TTZYp lj1Enc8g+79eJuVXB3hnRBCB2piR+E8CcJYx+uVH8649iMzm9tE3RIqaqCJRm6OX9W hBjx/LyLoEC1iO+MCZjUYjO+uSSTGMiujYyVvH5/Ko+7SrKiEsRO24PyaMjayETCbT a9LqpqYqKxEwM8uYxTUrUX6S2qSxfqKNfjVPF1fdp+UwXYD70qq1XyCvTpB7qIhX/u U1wZdX4EPeaRIqsTwKhwYbAAuP08rHata7wHSnLtCNuLX27r/NPX9eflnC2AGBDJlr r3zbO/cLtHdIw== 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=1624036923; 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=idgSGp39+/MC8Mu9Nt4ep/qb4n/cJMO2Km5gVVxsAXbMuEnW+cYamCHSJPVhpwP0R/tptN 5ExABUQk08vehUEHQru8MKKcbzIDcs+/raaBU09eNvXeXIKPtJgRbje+dFr/INGynTPhne KbE4BCjjXS8UgL+wTOgGENzftvLkJEdb9jT/cDLiQnqeKKjNe06cucRvVR5sfmre9BtLZY RJQwZwmM+Har8FQe2l0eciEshBYs8j80njefo9h0GPp+Kqktf9xwuuLZcpiOI8jgKZVjTg ecKw92wEv+ZzC1F2MHp0HyHG8beJRBWaBZzY7/peD6pDt82c5Q9DB/RCCBp0hw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036923; a=rsa-sha256; cv=none; b=hxL37JQPZDLsHFDBOcOP1ZO7AtNVHs5Qr027MCE4WMHuWhhyTVfVbTmzgrgJh0fRxbCeda xPrvyK/E5vTzfqSO3VXMLN1RH/YJr8IamJFHQWVZVhGArk46g7Svh3vtvEajxLsJEb/+uK kV7jb2P/jED8ic+xxlNXFacHKblFmIwZ74EgAFWr30sTby/cBeknABOIukkbbuzFRbODpy OCp16UJqRnipJFNf+WIBkSsdl+OfvenVIbXcRR7h7C8hRqc8bhzJLNbBj9i3/3oTxfIAvj iq29rSyRf97x+3/2PufM8KKx0SzQtbt8reNsWB1ZSasIc/iylftmrbMCtv0VOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=SpaKT6pI; 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=SpaKT6pI; 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: D16B513725 X-Spam-Score: 1.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: 8thK74dssZkN 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