From patchwork Tue Nov 19 07:26:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 70563 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 842D227BBEA; Tue, 19 Nov 2024 07:28:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 E1A0527BBE2 for ; Tue, 19 Nov 2024 07:28:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDIec-0001Ux-JZ; Tue, 19 Nov 2024 02:28:06 -0500 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 1tDIeb-0001UP-5o for guix-patches@gnu.org; Tue, 19 Nov 2024 02:28:05 -0500 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 1tDIea-0000W2-KO for guix-patches@gnu.org; Tue, 19 Nov 2024 02:28:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=ozRxwXMMIZnhXbWw3N67J12u1lgAEhBcYUIVaApL8Jg=; b=aP6Nme46t1NPWR4bMrj3zzRy7eu1nVecMdDEz3GwsG2I/OMH2QJFU9kWXmOz5aHTh5bpWadJyfKNasZVUPFafBmO4mOtnaNaAM2+A67g3rr4wl8/Jal1yM06IFir4H9Jn1xxiU4RXhWgfiBNwQxZhg+J2oli+v2LExFDYh/DCuT8PKfnb+u8X/pK7HFsdNFmhF7mW9N6ChlBgHGX8YUWRttdasTmychUDhtw6bTnAUQGIksXYnzkZns3FJ59dNIRU9T4Nu94hYMu3BLX1l5qxotvlXr4/916gq67neQ6srYJnS/P0PRR0AmCwO5VkKTL66GvGFGbHOSHXgFsT00ttg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDIeZ-0006fC-Er for guix-patches@gnu.org; Tue, 19 Nov 2024 02:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74433] [PATCH] gnu: clang-runtime: Fix build for versions 10 and 11. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74433 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74433@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173200124325543 (code B ref -1); Tue, 19 Nov 2024 07:28:03 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2024 07:27:23 +0000 Received: from localhost ([127.0.0.1]:40751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIdv-0006dv-7p for submit@debbugs.gnu.org; Tue, 19 Nov 2024 02:27:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:40930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIdt-0006dm-Al for submit@debbugs.gnu.org; Tue, 19 Nov 2024 02:27:21 -0500 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 1tDIdq-0001NL-Ea for guix-patches@gnu.org; Tue, 19 Nov 2024 02:27:19 -0500 Received: from 7.mo582.mail-out.ovh.net ([46.105.59.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDIdn-0000HG-D2 for guix-patches@gnu.org; Tue, 19 Nov 2024 02:27:18 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.140.100]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Xswzp3bkYz1Jqg for ; Tue, 19 Nov 2024 07:27:02 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-f8q6f (unknown [10.111.174.164]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 69E911FD4E; Tue, 19 Nov 2024 07:27:00 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-5b5ff79f4f-f8q6f with ESMTPSA id s92eKMQ9PGdojgQABTyu1w (envelope-from ); Tue, 19 Nov 2024 07:27:00 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G003f1425124-20aa-406d-a507-0f3a2de4bd65, 9D5F92B39B1411DA07333534545EDFC8D0A6424A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 19 Nov 2024 08:26:57 +0100 Message-ID: <20241119072659.12073-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4451245284988281570 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrfedugddutdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ozRxwXMMIZnhXbWw3N67J12u1lgAEhBcYUIVaApL8Jg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1732001222; v=1; b=JYdSrcmKbRNQhfKNd/4EN4FfTNmXrFs89xEDagqOCfQv74f/wb1gj9f/aF7bqD/RudX3GZTC k00syuEC28uElNbQXKtESFnsb0mvr5pM/h48/OvcO8WvhDnWAFv4vXHuPkHRDVh9S46gue8sDcA UjGc0ZXnAwe8BoQsCCRp78lKVF2dfYnMDXhwfGoRSVam2DoOGfEu+xsjdxYVvEaxFJRlCgS+LGt gdxB6rv8WxIn0ofTPoN71h0OLmWtp/Iq5kwwNYV+9TS1McGtJS6tva5CkaLl+1S8u/ZFj6JjMNX 7F0E3EybL2BuG+cywVqUyfbKzQJodqh3Aaths0Ww+CaXQ== Received-SPF: pass client-ip=46.105.59.196; envelope-from=ngraves@ngraves.fr; helo=7.mo582.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * gnu/packages/llvm.scm (clang-runtime-from-llvm)[inputs]: Add libxcrypt for versions 10 and 11. --- gnu/packages/llvm.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c6566a3339..e2b8b689ba 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -170,6 +170,9 @@ (define* (clang-runtime-from-llvm llvm (list llvm) (if (version>=? version "15") (list libffi) + '()) + (if (member (version-major version) (list "10" "11")) + (list libxcrypt) '()))) (arguments `(;; Don't use '-g' during the build to save space.