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 2DVlBWr8imZN7wAAe85BDQ:P1 (envelope-from ) for ; Sun, 07 Jul 2024 20:36:58 +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 2DVlBWr8imZN7wAAe85BDQ (envelope-from ) for ; Sun, 07 Jul 2024 22:36:58 +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=ff6uCHtU; 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=1720371557; 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=9aywCFLh8hHhmkWjevHtVbpjp8KAytbWhbHyMUA/Sdo=; b=aCOptjPIm62tVltTzR/nenCZYikg3ZW93yNwhCDPEPLjQKrReoSad/ILCxcbLtZew/I5w+ yM5KC9knpWjxsH7WmFcsEnfzBuVlZedbO5UVvaaDgwvOvjJxRMXWH/lbHDQRwpLUYZ0fYO jYsMzqlff+Gp9lImglWIK7VGrgp9Gk4b/U82ZQTp170zI/xBrb4aszBL+THXxW01RRFxSF PFCzVvufshcAwJme0629cleC+538Bkt6fioO+WnVvYWYzsAsEVSn0ezt9uXPJo2ubpbBCV PMyWZU7c8CJg17YvBn/o8ET7wwJrhEa7cZ3Pl/Nqgbz7sbU7cxepT6lfsqDI2A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720371557; a=rsa-sha256; cv=none; b=r9bwrUKXdYuAlGkjDrh6eP9BdoStvez/L5j2zGViGikojpJvY/94GMbEunyeQyd12wC/Id bUNtl6zzL3JowcdF7eL00+GOOnOm6A9zx0Q6vIh/dq/eYnDSq9nhmal3DZWdvHVUZccgb2 TMP4sXvKaHQJNPnjZZYhDT/8DMJep0Q/nG+w4TcQtq/VqJroQadZiQJGBQ1aZDwf3JVfcU TLMBHFDZUH37jeY0YYD5DyYeZ34EqYYKM4gCu8A4LfrEe2Ecwc5bRrxkz8/OSllUKvxcSv ErUbfekZJzbtIGoRJQrk0qEfSrXAmbQEPH+FjW+L4fNhPJwmZxjNZ/zK0e66RQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ff6uCHtU; 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 4EC4F6FFB6 for ; Sun, 7 Jul 2024 18:59:17 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQVE8-0001sD-Gs; Sun, 07 Jul 2024 12:59: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 1sQVE6-0001rx-AK for guix-patches@gnu.org; Sun, 07 Jul 2024 12:59:02 -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 1sQVE1-0007iv-JZ for guix-patches@gnu.org; Sun, 07 Jul 2024 12:59:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQVE5-0004sr-U4 for guix-patches@gnu.org; Sun, 07 Jul 2024 12:59:01 -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:59:01 +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.172037153618761 (code B ref 70985); Sun, 07 Jul 2024 16:59:01 +0000 Received: (at 70985) by debbugs.gnu.org; 7 Jul 2024 16:58:56 +0000 Received: from localhost ([127.0.0.1]:49055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQVDz-0004sW-VT for submit@debbugs.gnu.org; Sun, 07 Jul 2024 12:58:56 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:61685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQVDy-0004sI-P9 for 70985@debbugs.gnu.org; Sun, 07 Jul 2024 12:58:55 -0400 Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-79f02fe11aeso91914985a.2 for <70985@debbugs.gnu.org>; Sun, 07 Jul 2024 09:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720371465; x=1720976265; 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=9aywCFLh8hHhmkWjevHtVbpjp8KAytbWhbHyMUA/Sdo=; b=ff6uCHtU2bRubIxPMaUpdeOanloqcTsXYGnmWz25AUImsx7iilQ9ksliAfMUafVcEG 0MXATIU19KRYsktzpz/BFxE7AqbhXGiWrQD1e3f8RqSGLJnE+aXzYqenKpEMt9lDGPNc WoU2OhPnAOIzgC0WwH/0Yo+hb6+zlVDz3XlAF4IR5zJME5gJAecB36+2yVXwyji3PnkY cORisbkdEvitbnClx6TVE3O1ke7VWUs41so5kRp3BUYptP77oRdCIcUVGteXKQXv9Nrw xBXLh4KwtOo6b9FO2hi0/g3Dhx/BtBP4WfXZhsP+w4t5+RRXb37Ztr/PNlsHDsJAzGY2 AcOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720371465; x=1720976265; 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=9aywCFLh8hHhmkWjevHtVbpjp8KAytbWhbHyMUA/Sdo=; b=vMnmpCO3kIVrySUUi1TdXVPB0U9GqyitS/w71NPnTiR2/1PAoa1gRC90TSwHVYwI3u ZSuUO36coUdZCxE1WpJCcQCrNu9o7NRXCBrgOyWzXqcHVwYXABGzqpaS6EYq7Qy9OslI H/o8i33Or3R1uMHzw1TxYJEcH4ZFEkG8ie6syQHcLAXfu4woX770D7JQywEuD73Pu9Ox F++gcDQciLwO1eXNISlQnZ1q3C7bKif55VIzDS1kpZeNNimOF3rQNN9W8H68dKwk2xnw Tr5Xn25wus2YPFpIbFII+QfvL8wLI6d7P5KB7q+CP64DyfzmslEMRYBxlOWWtK5b6uci uIUg== X-Gm-Message-State: AOJu0Yx64AO0KdYL+srTGQp7zTF9gnzCvtMU+rxVciFeZC0FmF30JP5S t3IR0AHKtqo9REvVJURL3rhPyAT9UJ+8Sjg5TKKwCL67RSZimXwe X-Google-Smtp-Source: AGHT+IEC8lIqL23yzGa72XPEowEqZOeqnSYqhh5mCn8RNt9NatPpR0XP7oyte46+i9vIT61DeK+e5Q== X-Received: by 2002:a05:620a:530f:b0:79f:8ba:aea9 with SMTP id af79cd13be357-79f08baaffdmr292334885a.5.1720371464744; Sun, 07 Jul 2024 09:57:44 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d6932ff9csm980974285a.133.2024.07.07.09.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 09:57:44 -0700 (PDT) Date: Sun, 7 Jul 2024 19:57:43 +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="Zl6Et+AnZxZ/Ba7K" 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: 4EC4F6FFB6 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.99 X-Spam-Score: -6.99 X-TUID: EimdrdGyQxtE --Zl6Et+AnZxZ/Ba7K 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 This will probably work: (native-inputs `((,(string-append "gcc-cross-" target) ,(cross-gcc target #:libc (cross-libc tar= get))) ,(when (false-if-exception (cross-libc target)) `(,(string-append "glibc-cross-" target) ,(cross-libc target))) (,(string-append "binutils-cross-" target) ,(cross-binutils target)) ,(when (target-mingw? target) (if (string=3D? "i686-w64-mingw32" target) `("mingw-w64-i686-winpthreads" ,mingw-w64-i686-winpthreads) `("mingw-w64-x86_64-winpthreads" ,mingw-w64-x86_64-winpthreads))) ,@(package-native-inputs base-rust))) --=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 --Zl6Et+AnZxZ/Ba7K Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmaKyQEACgkQQarn3Mo9 g1H4gw//f7HneYmFBzgOhwuy9IrmMO2uGg5N1ULmIOih+hPns9oglOearlIdR5Mo uNEwsEsP8LlC0/8YBAsgaH3q/Q6rE1tEglV36lmdm2YE+ZDDFfPPQJqVxgtdX7lP elX3HWppu/q4PUsmtdgd/+qS1QCcaYSWan+e1ZLNMefJzm4/+6FOh+5E0MX0DjrJ A7vdrH2c1BPqEYmIxv+ipu2okeBMA0FpatUsYDqk6bobxNXuUUzr2AAZd7ErkbE5 xHc8hgyV0/U2Nv+jrAeNP+cbmBFqSmyl+sHfKOeS73nhvD2pujxtgy4/jY1Bv6qG uHThuL+xVrOF9OgZtFaoOe3UJmvhhmYOkCy4dUuy0wnZ7Ez9H7SShWS1MHA+fWuq em513Pfm3SzaK/13RwNditDmkMd3bywwwQfW9lY4Ecvb7SM0aFAoI5W7BVfVxc9q JKH8yARv50dPv2429uhvkQNYb4/IO5IbnJQ7ZzJNjaisX+ovhss1VP4h9cpDUbN6 jo4ps6whYa5s3Hgs9K5BFYAB24M/V5BOmXR3DGuU832zOleoVBBitPW4H9YTwEyr 9t7NYFTLqOBGcixsa4qmg7npFQ8j4PpGmwLdPhJunVCzA/q2oe4scPm9YPj+JYjU Ju3GhI6+O2gLrmZz9lmSfF1ROklAkCvJGtTCc7X0CfxaStBGba0= =eUOG -----END PGP SIGNATURE----- --Zl6Et+AnZxZ/Ba7K--