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 eUiTHjzaGGSbxwAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 23:12:12 +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 gD+0HTzaGGT2SgEA9RJhRA (envelope-from ) for ; Mon, 20 Mar 2023 23:12:12 +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 4C092392C8 for ; Mon, 20 Mar 2023 23:12:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjb-0003nG-1k; Mon, 20 Mar 2023 18:12:07 -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 1peNjX-0003kf-01 for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:03 -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 1peNjW-0003G8-MI for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNjW-0007Mn-I1 for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed glibc when cross-building for Hurd. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:12:02 +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.167935026428065 (code B ref 62307); Mon, 20 Mar 2023 22:12:02 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:04 +0000 Received: from localhost ([127.0.0.1]:56983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNiZ-0007IP-QT for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:04 -0400 Received: from jpoiret.xyz ([206.189.101.64]:46622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNiX-0007Hd-N7 for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:02 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id EA2F8185328; Mon, 20 Mar 2023 22:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679350261; 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=nTMMXo8jWgLVsVw0wMfuVmBah5AB+UIVtUEoAg3rrkE=; b=GHCyAZAjF4c7/umnNByD7g0HZAePVVp2HDBK9J+t57HB42hWxX31XKj/F8PfnP8Y/1bZ+D xeAMmmkR0IT3ij3k/OB4fNiuzR165FHODa+livjYK/eEhhorbWhE0NO363+qHFwfPJMHcn YwHYPjXcN1f8+JcjkwwHFyXmX2/m/i0c8PWOa7eI9eBn8el+vMl6keZNh2YhpNlO7eY7vW C0lcVl4AoFIuwufdTmsdkN6E0fp5elAkTHD7WAxZiiOFn77XmZOPOoMuorxq8n4Q6n+83q 5jbNNfBjaHPoYvfkeu1iLzbfaBuMGwPBxldxf4LD+nc8YQRl2wES0gefJTniPQ== Date: Mon, 20 Mar 2023 23:10:37 +0100 Message-Id: <7ff5ecb1b11b068bb68a0fd3d0e1b4ade986b08b.1679349992.git.dev@jpoiret.xyz> 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=1679350332; a=rsa-sha256; cv=none; b=dIAb6Pd6ZrvgsGWXoPB/rE5cKTUIdckOu1FBP9hCkJQfQQZgbvMx3WFMuzJYkZB5rK0IZk mNbsEm6Vz/i+WgNUwWsr7aTsZ4bBFeMC2taUDTVJaMHcvgbOfAYCtEPqmXLO5nxWbMJisT 5VqGt9k0j/dWQpoTHwitBMpaRK4orQVIPTM4Ih68x8ski8i/WCj9qfamBoBJTTyC9qr0kg pzhEsTx0U7Nujhb4l0bR9Qt22qblIgQaek/4QDQnM1QBEnpSQaqc2MVJ1DYw1WuuIxbU5p D0ImHrVKvrgHZL7WlbH5fPHDYG6Zn+L0Lra0ylqcJoKeWla5htaQy3FCa6nyuA== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=GHCyAZAj; 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=1679350332; 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=nTMMXo8jWgLVsVw0wMfuVmBah5AB+UIVtUEoAg3rrkE=; b=gca9wAB3Ws/0TM9DZMs0JEDvGMrYyShtjWiMueNP72ReASn3y4TEG5WJSBWUZTYem6pbQ0 s1V1GZeo4jl/7qoCsgGvHQ9YkIQwwI3MP1rVZSYTZ6WSvK+oJZIfOvcbH6PYrdKpnK7iDs EiC/GOkmppYRslkXyNVcxshNh2cpORGuxO9EYN8Vx0SKQKnPFzOE/jpdPeT7bNYZFQgwfh 1foijBpSkE/mf245kexxcwPQX3/Cxxg+UDSfGhWRsiGewlig/MWOrAQCbVgyn6+yLvnDvT PdSGMJZhS/Mi29KIisuzT0k8lsUh6OjUbB0iNJ7jvfJfY4puOqhFAH608dzt3g== X-Migadu-Spam-Score: -3.25 X-Spam-Score: -3.25 X-Migadu-Queue-Id: 4C092392C8 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=GHCyAZAj; 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: hxUOBO4sF/Qb * guix/build-system/gnu.scm (standard-cross-packages): Do it. --- guix/build-system/gnu.scm | 48 +++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 3308302472..98cf272726 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -442,30 +442,38 @@ (define standard-cross-packages (mlambda (target kind) "Return the list of name/package tuples to cross-build for TARGET. KIND is one of `host' or `target'." - (let* ((cross (resolve-interface '(gnu packages cross-base))) - (gcc (module-ref cross 'cross-gcc)) - (binutils (module-ref cross 'cross-binutils)) - (libc (module-ref cross 'cross-libc))) + (let* ((cross (resolve-interface '(gnu packages cross-base))) + (cross-gcc (module-ref cross 'cross-gcc)) + (cross-binutils (module-ref cross 'cross-binutils)) + (cross-libc (module-ref cross 'cross-libc)) + (libc (match target + ;; FIXME Remove this once the fix is in our glibc + ("i586-pc-gnu" + (cross-libc target + #:libc + (module-ref + (resolve-interface '(gnu packages base)) + 'glibc/fix-for-hurd-cross))) + (_ (cross-libc target))))) (case kind ((host) ;; Cross-GCC appears once here, so that it's in $PATH... - `(("cross-gcc" ,(gcc target - #:xbinutils (binutils target) - #:libc (libc target))) - ("cross-binutils" ,(binutils target)))) + `(("cross-gcc" ,(cross-gcc target + #:xbinutils (cross-binutils target) + #:libc libc)) + ("cross-binutils" ,(cross-binutils target)))) ((target) - (let ((libc (libc target))) - ;; ... and once here, so that libstdc++ & co. are in - ;; CROSS_CPLUS_INCLUDE_PATH, etc. - `(("cross-gcc" ,(gcc target - #:xbinutils (binutils target) - #:libc libc)) - ("cross-libc" ,libc) - - ;; MinGW's libc doesn't have a "static" output. - ,@(if (member "static" (package-outputs libc)) - `(("cross-libc:static" ,libc "static")) - '())))))))) + ;; ... and once here, so that libstdc++ & co. are in + ;; CROSS_CPLUS_INCLUDE_PATH, etc. + `(("cross-gcc" ,(cross-gcc target + #:xbinutils (cross-binutils target) + #:libc libc)) + ("cross-libc" ,libc) + + ;; MinGW's libc doesn't have a "static" output. + ,@(if (member "static" (package-outputs libc)) + `(("cross-libc:static" ,libc "static")) + '()))))))) (define* (gnu-cross-build name #:key -- 2.39.2