From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eCi6CVzaGGTldAAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 23:12:44 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uDu8CVzaGGT5ggAA9RJhRA (envelope-from ) for ; Mon, 20 Mar 2023 23:12:44 +0100 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 aspmx2.migadu.com (Postfix) with ESMTPS id 0023039510 for ; Mon, 20 Mar 2023 23:12:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjf-0003rm-Gk; Mon, 20 Mar 2023 18:12:11 -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 1peNja-0003mr-2g for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:06 -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 1peNjZ-0003HF-QT for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNjZ-0007Nn-MR for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 11/15] gnumach, hurd-headers, 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:05 +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.167935027528213 (code B ref 62307); Mon, 20 Mar 2023 22:12:05 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:15 +0000 Received: from localhost ([127.0.0.1]:57025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNil-0007Ku-9h for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:15 -0400 Received: from jpoiret.xyz ([206.189.101.64]:47242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNig-0007JT-Ng for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:11 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 15DEF18532A; 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=ugltOrMHe/epam7qqUe3vWboLSesgwj608C/1hg7tBA=; b=XTzwt0zS99ztwTZeGeHp+Yj6HVTMtkqKOnxsfYWUhSfgzNIV27jYaCj9LTxLWAHmVHWzMZ 1tpa/jIalRDqcQMOONC7rTx2Bjla/Qr04vdr/L8A9WR4JG/Jhfh88Wbz5Ebey3YPUciZow f0HcGpVO8AhKf0ahR8H2JeDvWHm0LUHaxYKckH9184EzGniFK9lkSSYKdHd/jpVZDmwWwj xmHHL5qmoi114vLTtwR+TIH7D05VhVa4XnEI4RJWXs0q3L5XP7Mgcc/oaMD9Q2VF9Urc5G IkxEM8dBCyTlftFJnAqVsb+UkbNGPv5uesNxz+kQNAD3pUaOkEsVDe2fqJbnJg== Date: Mon, 20 Mar 2023 23:10:46 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679350364; a=rsa-sha256; cv=none; b=RqKoJVoNAyf0yoteDgXHpa6gPLWVEPiMB5ZaJCWWpqf0kfwPPhZqbvszDvH7FoP/ia+Ky5 aKw4Gby6faSwVkqGW8pnIcXNgteWK6UkG7pBXiFjlS5wWyU8qmlC3CkU8y9IIpqBZkv5IR bHPrjJJbRcQBiLdqt1flUCNRDEhl+Z2Mpl7CLAjps8cpWka46rKrV0YmqYUp3MhZQyGZPf RcdXZX73z/4G91ap2egzrXUNfktvKirfe36WroJntfcJTNKePtB5otB01pXaqPG8OeguJv /4aofUrBFs9449qRncsIg5WkgZoKelDxfVQRbyJNzp9Aar3pWydjMkHel8bCGQ== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=XTzwt0zS; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679350364; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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=ugltOrMHe/epam7qqUe3vWboLSesgwj608C/1hg7tBA=; b=IEGGAzQVbaAzDI4yyAk3AJSJErUuc6qWET1Twz6D1B8A4SihsmW1tvAhU06Y6EZwPnkwez QLWLDZ5gzdZ9sIudQDlF7aTl5A9QpWJ+xUigMtSwnjhBPff9+c7qsheDZhrqGjo+zvrvts hVblXSlO0JnsLPQwsJ80luub8znCutHh27FbaUa7xnuM6nYldFEGhhM8/2B28KcJP3a0YN nhPLrdIsxN0N2ZHVcTbY3jgsRXeU58EYWSUqkZO8JL0mc3t4kAU6G6KcfvPlb6FiRh4oiB DgSVo09mUN4XIYymfHFFAMHr9qxMr9ZLCTfmt5a3lz8zw/BIphQNrTtR/e54Ew== X-Migadu-Spam-Score: -3.25 X-Spam-Score: -3.25 X-Migadu-Queue-Id: 0023039510 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=XTzwt0zS; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: RtlHOxbjRbvt * gnu/packages/hurd.scm (gnumach, hurd-headers, hurd): Switch to cross-mig when cross-building. --- 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 866a9a7ac1..be5eb25fee 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -183,7 +183,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 @@ -307,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 @@ -527,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))) -- 2.39.2