From patchwork Wed Aug 25 18:02:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32249 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 375C827BBE3; Wed, 25 Aug 2021 19:04:15 +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 0432F27BBE1 for ; Wed, 25 Aug 2021 19:04:15 +0100 (BST) Received: from localhost ([::1]:55448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxG2-0007px-0q for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFq-0007pK-Ee for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFq-0000n1-7H for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFq-0002m2-1m for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 01/52] gnu: dbus-glib: Support cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:01 +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.162991462410338 (code B ref 50201); Wed, 25 Aug 2021 18:04:01 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:44 +0000 Received: from localhost ([127.0.0.1]:47601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFW-0002gR-SS for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:43 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFT-0002fp-Ri for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:41 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3eRx; Wed, 25 Aug 2021 20:03:38 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:41 +0200 Message-Id: <20210825180332.5720-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: References: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914618; bh=hfFjrXCnpHe9Xb4MkhSNDh8CLBi9AmzJiR8R751SgSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kpuonUGR2mJ6x2mN6WsrKGDiMrHn2Oaqqk78UTKItYFemYgiytNKVsVznMM+zC0bG MSH3/f814MLfIWH5CLIpKjEGV6OTpy6NIDXl5tgzhnvarLTyn/aEWAMRUsOLzZ5hif vW99a3qR+k+iW6lPybt7UXVSrh8jy+FeLq6B8QRWmokrSWizyhz1ZaQSWRANKlNvMe 9wLJkSlSmaz2g1e1OjCtAEziI5/OEUd9xnzJq/lWDfyxRr/DmiPLssLNYKsf9n9f3G SI+GuzpAP7GzDldfajSusS85guJkP/78W8GUpW150Fb94agKjzod+HDgWI+T9Blvbi qxwZ9xrR4ULPg== 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 This allows cross-compilation to succeed when not using QEMU's transparent emulation, and the cross-compilation is not a pointless cross-compilation like x86_64 -> i686. * gnu/packages/glib.scm (dbus-glib)[arguments]: Set --with-dbus-binding-tool to a native version of "dbus-binding-tool" when cross-compiling. --- gnu/packages/glib.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f0328498e4..fc1c5eb271 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -550,6 +550,16 @@ translated.") (base32 "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w")))) (build-system gnu-build-system) + (arguments + (if (%current-target-system) + `(#:configure-flags + ;; Run a native 'dbus-binding-tool' instead of a cross-compiled + ;; 'dbus-binding-tool' when cross-compiling. + ,#~(list + (string-append + "--with-dbus-binding-tool=" + #+(file-append this-package "/bin/dbus-binding-tool")))) + '())) (propagated-inputs ; according to dbus-glib-1.pc `(("dbus" ,dbus) ("glib" ,glib)))