From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UG67OnGGJmFLmwAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:05:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id ePgwNnGGJmFoagAAbx9fmQ (envelope-from ) for ; Wed, 25 Aug 2021 18:05:37 +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 7AB96707C for ; Wed, 25 Aug 2021 20:05:37 +0200 (CEST) Received: from localhost ([::1]:60168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxHM-0002cA-GM for larch@yhetil.org; Wed, 25 Aug 2021 14:05:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG0-00086I-Tr for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFw-0000tD-OS 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 1mIxFw-0002oQ-KF for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 14/52] gnu: gobject-introspection: Don't build introspection data 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.162991464010635 (code B ref 50201); Wed, 25 Aug 2021 18:04:08 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:00 +0000 Received: from localhost ([127.0.0.1]:47693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFo-0002lM-BH for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:00 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFX-0002ft-PT 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 lu3d2500J0mfAB406u3jUD; Wed, 25 Aug 2021 20:03:43 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:54 +0200 Message-Id: <20210825180332.5720-14-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-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=1629914623; bh=Qr4WCtmdHd+go5M/vzaQHxm1iWDipay3cfIc2N7hvvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BUrUW5S0z9BKdvR/dpVKo5NR2nf1oGOGn8jliLCRmX4OKbkUDmiZ1cNdxDQqqgWZ4 hfPxqLz7H391g73OPrbYcyTfJY0APlNRVvOBcDARifD5ZS+fpWsFutFiJ47B+Em2zZ /VTyjXD6xdXKuMEglueTHPdIrK50b0g2NxR9JozAA+GzAaAniCsO6mfE6nXWBq7e2c R0I/XJYZ6PoQwqpfq0fcAeuH0B9Hc8Sv/vrON079KdaKFEXxA5lZ4HdQK03bcRq9On J/gWbSVjbxZ8WhzK2C7KHlnkaMeRbLt3Yg8+n+P7XYDOrcwiq476PvFz0MTdfRIu4S DNzCVVFQo2i+g== 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=1629914737; h=from:from:sender:sender: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=Qr4WCtmdHd+go5M/vzaQHxm1iWDipay3cfIc2N7hvvs=; b=qeN/jGlttLmn55Bv7baD9apx3bZvQGa/zoarSKhkjNu1pvCXhel/4gokY/Ec4fu+jM5R+l zhl8JyS7dBxlKVm10HcPaifMS+7mJplTKK+QQrDEP3j2U0faugrD4uYv1tN8TtCah29WAR Xwr0V48fqQNKcdseUeYmSgRVGfgQ8neJtF/F0J9V9AJ0S6MHzMjtwOHeATD8UNFrYabQPz BFVmJ2x4eKJKvlr9G+5HmRePSKPKRsefbF7Sd32ta40HD5+6eT6+QA5m3Ws0aDhZ6Soc3b XCrgu84PCSp13OLT9Jr6oPFvtJ/7ENt4fcmhTvQjIMSzctrwH1Or0FSF7h/DKg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914737; a=rsa-sha256; cv=none; b=XnnsabRF4N5PcJgoY1KfYhYROUmfRm7cq1B9SJaJwCOu0cJGxeYC4xpVQwx+JHKB/7/N2R pAVB5cHxCBvdj2iYIzsbWpfjnCSkwoyf+uAfhyA6GcoagN+2i3B1U0xNr4BEObHVvkGnAm NNjkWRGA80s6jKHyugf2d1nyP0fvfvf74FNPgy+/bCNTI/OVzK1xyT4Pi4BX8yWI1TdIKJ YwwcO2I/skPSD0RgDlHBDiD7QdSPvOm6HSSFn6UuxovoZxAUj8noG3tk7MEGY3MLFjCNLJ 3SSfB0J04/7gDMpSMbPy8pcQVeOdeqW1JYvSUYyhLd8tScvw+22q3jXolHzkFw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=BUrUW5S0; 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: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=BUrUW5S0; 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: 7AB96707C X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: LCyMCygV5esS * gnu/packages/glib.scm (gobject-introspection)[arguments]<#:configure-flags>: Set gi_cross_use_prebuilt_gi to 'true'. (gobject-introspection)[arguments]<#:phases>{set-typelibs}: New phase, avoid undefined variable in "meson.build". --- gnu/packages/glib.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fc1c5eb271..060122f42b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -398,8 +398,28 @@ functions for strings and common data structures.") "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments - `(#:phases + `(,@(if (%current-target-system) + `(#:configure-flags + '("-Dgi_cross_use_prebuilt_gi=true" + ;; Building introspection data requires running binaries + ;; for ‘host’ on ‘build’, so don't do that. + ;; + ;; TODO: it would be nice to have introspection data anyways. + ;; Would copying the introspection data from a native + ;; 'gobject-introspection' work, or is introspection data + ;; architecture-dependent? + "-Dbuild_introspection_data=false")) + '()) + #:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + ;; 'typelibs' is undefined. + `((add-after 'unpack 'set-typelibs + (lambda _ + (substitute* "meson.build" + (("\\bsources: typelibs\\b") + "sources: []"))))) + '()) (add-after 'unpack 'do-not-use-/usr/bin/env (lambda _ (substitute* "tools/g-ir-tool-template.in" -- 2.33.0