From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SA6INffCimYBEwAAe85BDQ:P1 (envelope-from ) for ; Sun, 07 Jul 2024 16:31:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id SA6INffCimYBEwAAe85BDQ (envelope-from ) for ; Sun, 07 Jul 2024 18:31:51 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=aLVlo+Z7; dmarc=none; spf=pass (aspmx1.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=1720369707; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=15SJFXjlf524RGts1Z1nkLgPIsPpAZmXzrGfAkZlTkc=; b=GKgH+NG5lzCMornQyNrd1ExgqLFyCeE87Pe8r3cEss/AMYinPkkVdPxLjQBXB4crw/lSbu rxYbxCbtFXi61ha1yhLVn383K7s0X0qD3xyDSWs/XpyIsuKk2soojntm2PntCy5Pfhrb1Q oFvoJvfKgSCnqf3ehRufnwigROlyhh+Cs2N3KhUQm66YG6Co2rayyGwFHa+Vud69KP8jep F3qMVXx+hKWoOrWMJ3XL/K8bPMGRBz/bNYLktsZ0CawJuAfHHVlnY2TDTkH7MUVsYyfwqu v6fXz91oAd5A/qriuuN+yK1CfaoEQ4UkInLdskxlV0MIEzKaF7m7R31sVYehjA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720369707; a=rsa-sha256; cv=none; b=pmsFRJ/wG18qFl98V1SiO0gIfwr88BgePXIkScfH/PxYPRwfNf5tYWgpTtIRF5b/QdDv2d hmfTV4riprFOxFrNzoME16CNa1CM2O4+DfAyctNXRcBBUVFNUkdAZzTOC+n/41WVCxr0Pi /lmjKzhAN/9QP7kzAK652ETvb58hMjYx1iI14MqWRh/H/FyyQc7XdeQ58o9n7VSedlz2+M UvJkonfkJhFtve062V1mjn3Z+hLxD99mezJcxLO78NWdtrHsFbEPUAo5a1zoOBCq961k9D +k4yNdgcOOmM06wystOjYSigXFzfb95bNKYLTCW7YxThgEuZwHspK+jQW8FVHg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=aLVlo+Z7; dmarc=none; spf=pass (aspmx1.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" 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 aspmx1.migadu.com (Postfix) with ESMTPS id 2419E6D652 for ; Sun, 7 Jul 2024 18:28:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQUk8-0003QY-Ep; Sun, 07 Jul 2024 12:28:04 -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 1sQUk3-0003Pz-CH for guix-patches@gnu.org; Sun, 07 Jul 2024 12:28:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQUk3-0001Ix-3c for guix-patches@gnu.org; Sun, 07 Jul 2024 12:27:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQUk7-00046U-CS for guix-patches@gnu.org; Sun, 07 Jul 2024 12:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2024 16:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70985 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 70985@debbugs.gnu.org Received: via spool by 70985-submit@debbugs.gnu.org id=B70985.172036966915734 (code B ref 70985); Sun, 07 Jul 2024 16:28:03 +0000 Received: (at 70985) by debbugs.gnu.org; 7 Jul 2024 16:27:49 +0000 Received: from localhost ([127.0.0.1]:49028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQUjs-00045h-NH for submit@debbugs.gnu.org; Sun, 07 Jul 2024 12:27:49 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:48513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQUjq-00045V-RQ for 70985@debbugs.gnu.org; Sun, 07 Jul 2024 12:27:47 -0400 Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-44634afb2e7so27720921cf.1 for <70985@debbugs.gnu.org>; Sun, 07 Jul 2024 09:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720369597; x=1720974397; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=15SJFXjlf524RGts1Z1nkLgPIsPpAZmXzrGfAkZlTkc=; b=aLVlo+Z79S+n/0VzM1t0GWT91GgYxo2qwEJIas6k2Oljojbd5WrsNwXYRNsW270Iuj LgH+KrFX/A2hWlmxLRiw8dmb//E2x7fDmWh9Nm1eUPz77gZtxRvi8NYURtvNxC8dzISk OJxdCpwPgRopnUdFxx83jmEi3cFO2m0ixev7YZPoUOXYaA2Pknw5LactX2QSaK0HxWpN lTu89eYGP2F5oS+XduHg/llWCtRfZeEmRLfWj+KY01uOAY9wQG6pauaXGMvThBHbc1ZI aHwNRHKCfkKmHCxaJca9Ik6uXA+L3kWrrrzL5Pur5zCqERwQFKViJThfdzM8UREh4P6l FVRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720369597; x=1720974397; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=15SJFXjlf524RGts1Z1nkLgPIsPpAZmXzrGfAkZlTkc=; b=VAot651IvKu9Tcnja1jUJdQTHYdgwUPhRdsiLL6yjuPOZpkb+bWDYZYFhM0X+HQQMt 7knWNth968sXeJjhSI8sCL7NjshbUkBm3uLoaoYl/YvwSnoqhUt5WlJRu0CDJ2ct1gw9 i6orA8wVUI983g2fGSQVZpSYpDDO7YsKei6P+QwBx2jPOBhulgJBdWthxzohc4hf8tUB Io9MOfPTyWoLOFtiTCpBaeTYTrebCF1MB6qR6sxVE6e9rhPbBd5/KJokZl1eKkMklVfl 16pG9bD+tCwK1OnfFxSjnv4sAc/wC9drchZsyX3qNgcRJJolmEuUVGE1sIrFtugmt3Og Nihg== X-Gm-Message-State: AOJu0YzoSYQGJJ+8TFR5sRlzuL1DySB4XFFwHx70iUNR+Eu53+V3f7VT HMkM8HrNmIgeg+qjWNLGuUqhk7GhOiZz8WeHt7mNhazRvwHCwU7E X-Google-Smtp-Source: AGHT+IG9ikZiqWixMgBxsYkZuWZFWZ6Ur5F25gZ4cqCyFBgEDF/amUxxQoAwyHHimEUX/iXnqF4T7A== X-Received: by 2002:a05:622a:1208:b0:441:338c:77da with SMTP id d75a77b69052e-447cbeedb01mr138295851cf.7.1720369596746; Sun, 07 Jul 2024 09:26:36 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447e529b7ccsm12916461cf.79.2024.07.07.09.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 09:26:36 -0700 (PDT) Date: Sun, 7 Jul 2024 19:26:35 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Christopher Baines , 70985@debbugs.gnu.org References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="oOK2TDWfVhBmsKm+" Content-Disposition: inline In-Reply-To: <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 2419E6D652 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.99 X-Spam-Score: -6.99 X-TUID: TIGRY51uTyuz --oOK2TDWfVhBmsKm+ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 05, 2024 at 06:06:02PM +0200, Christopher Baines wrote: > * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against > cross-libc returning #f. >=20 > Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 > --- > gnu/packages/rust.scm | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index a385344473..f1de34b277 100644 > --- a/gnu/packages/rust.scm > +++ b/gnu/packages/rust.scm > @@ -73,7 +73,9 @@ (define-module (gnu packages rust) > #:use-module (ice-9 match) > #:use-module (ice-9 optargs) > #:use-module (srfi srfi-1) > - #:use-module (srfi srfi-26)) > + #:use-module (srfi srfi-26) > + #:use-module (srfi srfi-34) > + #:use-module (srfi srfi-35)) > =20 > ;; This is the hash for the empty file, and the reason it's relevant is = not > ;; the most obvious. > @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation > (modify-inputs (package-native-inputs base-rust) > (prepend (cross-gcc target > #:libc (cross-libc target)) > - (cross-libc target) > + (or (cross-libc target) ; could be #f > + (raise (condition > + (&package-unsupported-targe= t-error > + (package (libc-for-target = target)) > + (target target))))) > (cross-binutils target))))) > (properties > `((hidden? . #t) > --=20 > 2.45.2 rust does support architectures without a libc, for example the mingw targets a few lines above this snippet. I think it would make more sense to only include (cross-libc target) and not if not. I just tried building zoxide for powerpc-linux-gnu without (cross-libc target) and it tried to link with the x86_64 libc, so it looks like it is necessary where it is available. How about we make this section even worse with: (if (false-if-exception (cross-libc target)) (modify-inputs ... (cross-libc target) ...) (modify-inputs ...)) ; no (cross-libc target) In the meantime, I'll try to figure something out for actually putting everything inside one modify-inputs so we don't have an ever expanding number of them. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oOK2TDWfVhBmsKm+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmaKwbEACgkQQarn3Mo9 g1FDqxAAuTyQYrIzorqMoR0Tp1UIpdGlB05+2l/N8jOXhW1hKDgc6LtwmMAP+gyZ Y+puuSGnhpuJ6CFG1IX4rRuajvkVJHStzo9rpZ7h5RQU/3uPjeaGtRarSJlKX+kq OhlN0CRTce9jUBBh+yKR0Agg/LyYovFwFe/hP5dMye6WU0a6xHPqVJYMUvM1t4pP Tnb3mrtPOCMTUJysyqO4+iIqWJhZ54SmEdkFrZylMq2azc3sOw3w2d0yOLbhrqjc vF294rWVcJUvE0qRgr/SwkTA7JIwRf+IqcrQFYlktyNfj0objTg5A4DIj1NlgsG8 WjKVoHvGYJo3Do5kK2mq2L1fJpXWXKWSckxS+UStVUnGkFFh08cNm25FxUBu4PF9 TE0PUAraUGThhxLOn3zrnUbZIUpcKYCWnBvXROxJswtGCxhAD9kZfYUxT4jhJtY/ XSXzUIhYimlCsqwGaytiCDz6wb22bubCcLy9FveWrfWtC5CxStDgLonnL1lcnQxt 8o6/MiK0GmW2QR/o+e6zEUgOCqhzZHzMYBDA7ec8mERLO7TQM6WxVmtEUSXGNWOM N5Mi5NnTHjnOr/0ipi6v7jyO8yW7a10fEFKuzpZFiOJp1tnObWOa42+zM0V/dcH0 bZq/PPzscNNZK4w4ZviypvCUpDEIfE+Hqllk04qWMiDpL4sR2wM= =+WL7 -----END PGP SIGNATURE----- --oOK2TDWfVhBmsKm+--