From patchwork Wed Aug 25 18:02:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32256 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 56DFB27BBE3; Wed, 25 Aug 2021 19:04:40 +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_H2,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 2840827BBE1 for ; Wed, 25 Aug 2021 19:04:40 +0100 (BST) Received: from localhost ([::1]:56826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGR-0000Q0-3y for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:39 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)