From patchwork Mon Mar 20 22:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48466 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 51C1416F1F; Mon, 20 Mar 2023 22:12:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 1E96016F2D for ; Mon, 20 Mar 2023 22:12:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjh-0003vL-Tl; Mon, 20 Mar 2023 18:12:13 -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 1peNjb-0003nY-NY for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:07 -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 1peNjb-0003Hd-5N for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNja-0007Nv-1V for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 11/15] gnumach, hurd: Switch to using cross-mig. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:12:06 +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, Josselin Poiret Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.167935029428241 (code B ref 62307); Mon, 20 Mar 2023 22:12:06 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:34 +0000 Received: from localhost ([127.0.0.1]:57027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNj3-0007LQ-M0 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:33 -0400 Received: from jpoiret.xyz ([206.189.101.64]:47306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNih-0007JZ-Fz for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:12 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id CBCC2185328; Mon, 20 Mar 2023 22:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679350270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S+BIpMfUgQhxflPPXeh9hfaedo8o+QCToZK1b0Q/Mb4=; b=TUNAV/yJgevgC3CfJM7vUbhyLj9NNwCiYQSRbRHPlMlcVi3KnbcEn639TI8Q6f8zkb798G dBVNOeijr+R+d9meBIZflEKUqxZRc1Wc0yu7Wsf8elbJYKm8qp05NTGmQOtGpNnBfA/2sm DbgvbZDaNibN4lqS7xGZoTgKyDaya2Z389sWN00Zf9aZW9n0QOGZCRniRv+41j9A/4WNrq 43xEUKXWAQ9dAx4FrfwmyTS9rKOf6oi7P3gMvn6E5mR6ekaE6233h6Oc4CVQStlUiiIZJn RyhkTFBURUsZgs8Ux9g/VLi3Khf5/1tuk6ittRb0T2UnzkOZrBWFH9Z+Z9y51Q== Date: Mon, 20 Mar 2023 23:10:47 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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 * gnu/packages/hurd.scm (gnumach, hurd): Switch to cross-mig when cross-building. --- gnu/packages/hurd.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 2a823f6576..be5eb25fee 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -313,7 +313,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 @@ -533,12 +541,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)))