From patchwork Tue Mar 28 14:28:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 48764 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 2E0F9170FD; Tue, 28 Mar 2023 15:31:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C533170F6 for ; Tue, 28 Mar 2023 15:31:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phAL0-0004jd-33; Tue, 28 Mar 2023 10:30:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phAKv-0004g0-43 for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phAKu-0006s1-Qi for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phAKu-0002bS-Jx for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates v2 11/20] gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Mar 2023 14:30:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org Cc: Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.16800137839804 (code B ref 62307); Tue, 28 Mar 2023 14:30:08 +0000 Received: (at 62307) by debbugs.gnu.org; 28 Mar 2023 14:29:43 +0000 Received: from localhost ([127.0.0.1]:50422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKU-0002Xx-S8 for submit@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKD-0002Uq-JW for 62307@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phAK8-0006R2-Bj; Tue, 28 Mar 2023 10:29:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=CqGMvaQlUIiPjBm6k8Qjeq1dtkstSZZBM9f+NmG/+yw=; b=km0LwL0xCehIWD5LRS87 Q2Om9mlCQoDDwls11HpOk2bxANEBGpJuHFZBSHDnAchRPK03HsOfdVYEgD2TnvRKUq7zBWLCgfgeW I8OzbxzlN+N+XetcxihfLFTm4zRb/Gr7DjCY4rptuRahQBEmjGrd8PiB1IaIf3JmqGUaOrv0nFV3G w1n5F9AvxN6uFSUvud4mIMz5OGh1TseKZ2x3qoIavJ5kE65mdDIo9GonJiGcYGM8V5rgBuD6gF2+9 eRlKt9JmhZ3TV1ioC5d63vFIh1SaAsaJTjDh6iDOD6af+EENOuCJaQawox8Mu5VU63jW/Y1330yH9 ijzIbGKyPky09g==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phAK7-00026Y-U6; Tue, 28 Mar 2023 10:29:20 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 28 Mar 2023 16:28:43 +0200 Message-Id: <20230328142852.26635-12-ludo@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230328142852.26635-1-ludo@gnu.org> References: <87pm90bzva.fsf_-_@gnu.org> <20230328142852.26635-1-ludo@gnu.org> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/hurd.scm (gnumach, hurd-headers, hurd): Switch to cross-mig when cross-building. Signed-off-by: Ludovic Courtès --- gnu/packages/hurd.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 375e8af76a..7ad893380c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -188,7 +188,13 @@ (define-public hurd-headers "hurd-fix-types-of-read-write-and-readables-methods-2.patch")))) (build-system gnu-build-system) (native-inputs - (list autoconf automake mig)) + (list autoconf + automake + (if (%current-target-system) + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) + mig))) (arguments `(#:phases (modify-phases %standard-phases @@ -312,7 +318,15 @@ (define-public gnumach (invoke "make" "gnumach.gz") (install-file "gnumach.gz" boot)))))))) (native-inputs - (list mig perl autoconf automake texinfo-4)) + (list autoconf + automake + (if (%current-target-system) + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) + mig) + perl + texinfo-4)) (supported-systems (cons "i686-linux" %hurd-systems)) (synopsis "Microkernel of the GNU system") (description @@ -532,12 +546,12 @@ (define-public hurd `(("autoconf" ,autoconf) ("automake" ,automake) ("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config' - ("pkg-config" ,pkg-config) ("mig" ,(if (%current-target-system) - ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, - ;; hence this hack. - mig/32-bit + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) mig)) + ("pkg-config" ,pkg-config) ("perl" ,perl) ("texinfo" ,texinfo-4) ("dde-sources" ,dde-sources)))