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 YPSjKjmGJmGQmQAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:41 +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 yEdRJjmGJmESIAAA1q6Kng (envelope-from ) for ; Wed, 25 Aug 2021 18:04:41 +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 645AE7022 for ; Wed, 25 Aug 2021 20:04:41 +0200 (CEST) Received: from localhost ([::1]:56826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGS-0000Q0-Bn for larch@yhetil.org; Wed, 25 Aug 2021 14:04:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG0-000869-R2 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFx-0000tI-56 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFx-0002oX-0V for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 15/52] gobject-introspection: Fix inputs when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991464110642 (code B ref 50201); Wed, 25 Aug 2021 18:04:08 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:01 +0000 Received: from localhost ([127.0.0.1]:47695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFo-0002lU-LL for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:00 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFY-0002fr-H5 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:45 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3kUP; Wed, 25 Aug 2021 20:03:44 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:55 +0200 Message-Id: <20210825180332.5720-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914624; bh=kS3t+jybC3TprxDYFZnwyHLFzPrYqoflKDh+p7gUA0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Kdw+PGPKOxIbT1ln4WFSHuel89Niii4xqfdJJdAEMPdM55TKZxjr1tkKmbn5i4epy fZREq4GOjCHkI80BJwYlSKsRRmJt/1AetP5a8964FBBhAn3QmrjSA3qMqzeN9ikr7V 8MMZ3WbVZcqkZFSVd6rJjfnz1SyaZj0rfxfU4aXahaN7VD+4hgi4RAzYuztCoPd7Qs aCRmvzIIQJo8UYjnCTsblaps8pgOPPCqTFv9a8x4IYvFLNkqrvZHgNvlG5b8uxzn78 hZdGL/H6iAS0fEAaIsoS81fadV+L/UKF5ASc7Ey+Ac3RQ/GX1Y5Kir8osuF1jpjTTF XFkr8lGIbwDqw== 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=1629914681; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=kS3t+jybC3TprxDYFZnwyHLFzPrYqoflKDh+p7gUA0s=; b=tytNxllXCvrazcp3YJn4SCY/XWyqEiwPbuivYwxsg3MoOl1E/W9PDZ/cHjWjqArO1wnGHS XOthXWMn7Z5xlHgX7OjHNbjIDLt2mAMOaLI/7lKi3xwnMbBR0/gkiTjbtSjEB/0cvDdeOU GodTjqWuYySUFHenbzQjOUNZAKXt42bQTPt2MFGYvORIW4yuqu6SZkJMf2JhlOLVseoa49 KPKqi3mT88I4sGPMi4czXYnE3rEeUQAlr5qw339yw1cq/plXalJaJDHjnzPbPaepsnWCYr b/6ZPZfbhUZ75QGV91ReErZVCkfTsp4Tu1zQj4t6DiZo+4XRh/68ggRL9SF0sQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914681; a=rsa-sha256; cv=none; b=RoG6Y3lZFIDKHEQ7KcINZt0s3kYXIDnolMt4/GexQdDQkRq9EL7u3WsddzxB1Ya+NOmLCj nha5QZFE/fjrL/gpBVMtzf504hFcU8Ctim+dzSJZwBfuCI1+HtTtAALBd8yHI+B0M0uOS2 43w9W9wQzBHlr5rVYOodYaD9p8W+TRZPwe+5UnzRlsMusdBkEEs8+8WN9cM1GC8z4bURBN R3xWkbY2zSLTAGka9jwkvvwt5nIaDK9rEUiNgqcoPdZlLPg2O9OOUAsYuFGAwK0iUR6prD 6je6kjyQlJ5R+y9D20o+/5ZuN/FwjqDB4jCKsmJHeQj6ET/9s4hhHKTn4eu7Dg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Kdw+PGPK; 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: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Kdw+PGPK; 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: 645AE7022 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: XYVSe6ddjiCQ * gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Add 'bison' and 'flex' when cross-compiling. (gobject-introspection)[inputs]: Use 'python' instead of 'python-wrapper' when cross-compiling. Remove 'bison', 'flex' when cross-compiling. --- gnu/packages/glib.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 060122f42b..ac38cd40d2 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -428,11 +428,19 @@ functions for strings and common data structures.") #t))))) (native-inputs `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ;; TODO(core-updates): Unconditionally place "flex" and "bison" + ;; in 'native-inputs'. + ,@(if (%current-target-system) + `(("bison" ,bison) + ("flex" ,flex)) + '()))) (inputs - `(("bison" ,bison) - ("flex" ,flex) - ("python" ,python-wrapper) + `(,@(if (%current-target-system) + `(("python" ,python)) + `(("bison" ,bison) + ("flex" ,flex) + ("python" ,python-wrapper))) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0