From patchwork Tue Mar 28 14:28:37 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: 48771 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 CE3F717106; Tue, 28 Mar 2023 15:31:50 +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=ham 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 35D0617011 for ; Tue, 28 Mar 2023 15:31:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phAKu-0004fB-As; Tue, 28 Mar 2023 10:30:08 -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 1phAKs-0004dg-SS for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30: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 1phAKs-0006qi-Id for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phAKs-0002aq-Cj for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates v2 05/20] gnu: cross-base: Add cross arguments to hurd derivatives. 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: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 Cc: Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.16800137819763 (code B ref 62307); Tue, 28 Mar 2023 14:30:06 +0000 Received: (at 62307) by debbugs.gnu.org; 28 Mar 2023 14:29:41 +0000 Received: from localhost ([127.0.0.1]:50412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKS-0002XJ-L7 for submit@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAK9-0002UR-2P for 62307@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:21 -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 1phAK3-0006Oj-Ry; Tue, 28 Mar 2023 10:29:15 -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=HnZ1VNh69iS79UM4p0FRI8XzXvNC+eWIpaBJsm5PJMQ=; b=iQOH9TvSC2URKIYKYVpn srtgrdO5b3TVECM+PXqNFnRBpWf6NlX8mV+E1u/eHl87gXJJikf5MXvP0lrD7R5exn8J3gNI0ifRf pUrIlMlTHrB1Svmf0FezWziO0/jTu0be5oBYGxKgfE1eTk2FtCZx54q3SYnOPC+Ms1+EC2G2YAs7w EKxcyr7BEBFEYMqebB55Bzz8WfMOpberqmyM1/Lo1fkMfuk9+sSBph9tYMp+rQTvuYErnWBPFdUkv zXqbfbr8uQ0/ib+Mv3G/DGRXsHICg6Oa+aDyqtDXi0XEb8V0xWKaBz+65Frz82Itgatp1khe7H0qe PD6T23QxatJOrw==; 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 1phAK3-00026Y-Eb; Tue, 28 Mar 2023 10:29:15 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 28 Mar 2023 16:28:37 +0200 Message-Id: <20230328142852.26635-6-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/cross-base.scm (cross-kernel-headers*): Add --build and --host to xhurd-headers and xhurd-minimal. Signed-off-by: Ludovic Courtès --- gnu/packages/cross-base.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 2a7c4d8011..bda494fd02 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -458,10 +458,17 @@ (define xhurd-headers (name (string-append (package-name hurd-headers) "-cross-" target)) + (arguments + (substitute-keyword-arguments (package-arguments hurd-headers) + ((#:configure-flags flags) + `(cons* ,(string-append "--build=" (%current-system)) + ,(string-append "--host=" target) + ,flags)))) + (native-inputs `(("cross-gcc" ,xgcc) ("cross-binutils" ,xbinutils) ("cross-mig" ,xmig) - ,@(alist-delete "mig"(package-native-inputs hurd-headers)))))) + ,@(alist-delete "mig" (package-native-inputs hurd-headers)))))) (define xglibc/hurd-headers (package @@ -506,6 +513,10 @@ (define xhurd-minimal (guix build utils) (srfi srfi-26)) ,@(package-arguments hurd-minimal)) + ((#:configure-flags flags) + `(cons* ,(string-append "--build=" (%current-system)) + ,(string-append "--host=" target) + ,flags)) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'set-cross-headers-path