From patchwork Fri Feb 4 21:17:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 37001 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 5738F27BBEA; Fri, 4 Feb 2022 21:24:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable 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 B699A27BBE9 for ; Fri, 4 Feb 2022 21:24:21 +0000 (GMT) Received: from localhost ([::1]:41226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG644-0000w5-Oi for patchwork@mira.cbaines.net; Fri, 04 Feb 2022 16:24:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5y0-0004oc-2Q for guix-patches@gnu.org; Fri, 04 Feb 2022 16:18:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39112) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5xy-0003uT-B7 for guix-patches@gnu.org; Fri, 04 Feb 2022 16:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nG5xy-00037l-5Q for guix-patches@gnu.org; Fri, 04 Feb 2022 16:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53787] [PATCH] gnu: LLVM: Support release candidates as version. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Feb 2022 21:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53787 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53787@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164400947811997 (code B ref -1); Fri, 04 Feb 2022 21:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2022 21:17:58 +0000 Received: from localhost ([127.0.0.1]:33009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG5xu-00037R-Ar for submit@debbugs.gnu.org; Fri, 04 Feb 2022 16:17:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:36732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG5xs-00037J-DM for submit@debbugs.gnu.org; Fri, 04 Feb 2022 16:17:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5xs-0004nZ-6g for guix-patches@gnu.org; Fri, 04 Feb 2022 16:17:56 -0500 Received: from [2607:f8b0:4864:20::1042] (port=35344 helo=mail-pj1-x1042.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5xn-0003sG-T5 for guix-patches@gnu.org; Fri, 04 Feb 2022 16:17:55 -0500 Received: by mail-pj1-x1042.google.com with SMTP id z14-20020a17090ab10e00b001b6175d4040so14273338pjq.0 for ; Fri, 04 Feb 2022 13:17:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=gD0829+tdovKKMRtyP80Op/U+nxWga/tBDAx8iy/1XA=; b=uriGLMmffDYXhUkTBHypRBs+5lqBgLiVLTUID8Dg4VS3b7B+bv9mzUz8u83mGF37Qo Ubzh3ydzRdSNkvhaFXS+dBElEfFgSpCOfzGoCXH9KaC8LP5MXiGgd9qs7pztGu5TmYpa SPE/0M8gwrmCCGKPXM+5E2p6jiRN2Gtjv1vhN34BsQlR/MH/7cqKG0FV5Pwi3U7mdNzW zBhtTkc9SmywZ84MaUE1L+TLok0C5mbZaDaL4GnpcIqK9uNZGulhVbm1JurO1x0FmI0/ YQb4cpzGvOctf9f5siYgVeFA7Ms3cTZdMBmAJTIkCSUeR95H1x+RNdF0jrTgrZQ+gXs9 aAMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gD0829+tdovKKMRtyP80Op/U+nxWga/tBDAx8iy/1XA=; b=gusq3mu7AYeBEblBvREZDMp8oje2i+hwnieK70bO0t1zOyTXSRI/XMRTdMnQWxgVcM u9jiVuxaeDYWUFHV0LtzpGNoawqQ7VTgghxsW/giEX1mcLWTq2xJUeLqIyuRlsffWdSN UmN9N3QMGIgCSLHbteOEUDMR2DQlgUcQIGj3KBT56Gl8JjusODQ4duYyJUsfSK7A6G3D X7zZy98MkFMdY1GwTUdz8Im2lL6YSTOd45ChMfJ/xbXPaZ0De5Wv1lYp1eidGVthCoGl J3zUp9rBs94J92M8NPyOPvNf7xyfmzBBrAfsHkD+gXRlG0GZ4RfTIZGHQKhIjOpp2wu7 tsZA== X-Gm-Message-State: AOAM532l9Knrl2fqGqmwQDU2q7/jjT2tJwxPOuk9kE4syLDjXBTYa9Jd KUmYgnucQRcuNF1+TZ60rtce776rw9n2P1N6mcZ151306lMseU1vjQHJSw== X-Google-Smtp-Source: ABdhPJzdrCiRI6fu2KGgl4GnFScq11W4U5kaL0atzKREhDc/remll/BmvJAPVd9MZ9jqoJ7LySK6g8KqbLNm4caLGqk= X-Received: by 2002:a17:90b:4d11:: with SMTP id mw17mr5245390pjb.9.1644009470095; Fri, 04 Feb 2022 13:17:50 -0800 (PST) MIME-Version: 1.0 From: Greg Hogan Date: Fri, 4 Feb 2022 16:17:39 -0500 Message-ID: X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1042 (failed) Received-SPF: none client-ip=2607:f8b0:4864:20::1042; envelope-from=code@greghogan.com; helo=mail-pj1-x1042.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I recently used this patch when building the LLVM release candidates to unsuccessfully fix a bug in a statically linked clang when building ungoogled-chromium. Due to the complexity of the interlinked LLVM packages this seemed much simpler than package variants. Patch inlined and attached. From 11df3eecb2b21575fb96b99561a38b75cfffbc52 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 3 Feb 2022 20:47:35 +0000 Subject: [PATCH] gnu: LLVM: Support release candidates as version. * gnu/packages/llvm.scm (llvm-uri, clang-from-llvm): Support release candidates as version. --- gnu/packages/llvm.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) version) ".src.tar.xz")) (define %llvm-release-monitoring-url "https://github.com/llvm/llvm-project/releases") @@ -223,7 +225,7 @@ (define* (clang-from-llvm llvm clang-runtime hash (invoke "tar" "xf" extra) (rename-file ,(string-append "clang-tools-extra-" - (package-version llvm) + (string-delete #\- (package-version llvm)) ".src") "tools/extra") #t))) From 11df3eecb2b21575fb96b99561a38b75cfffbc52 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 3 Feb 2022 20:47:35 +0000 Subject: [PATCH] gnu: LLVM: Support release candidates as version. * gnu/packages/llvm.scm (llvm-uri, clang-from-llvm): Support release candidates as version. --- gnu/packages/llvm.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index acd56c3d92..64b4e7521d 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -99,8 +99,10 @@ (define* (system->llvm-target #:optional ("i586" => "X86")))) (define (llvm-uri component version) + ;; LLVM release candidate file names are formatted 'tool-A.B.C-rcN/tool-A.B.CrcN.src.tar.xz' + ;; so we specify the version as A.B.C-rcN and delete the hyphen when referencing the file name. (string-append "https://github.com/llvm/llvm-project/releases/download" - "/llvmorg-" version "/" component "-" version ".src.tar.xz")) + "/llvmorg-" version "/" component "-" (string-delete #\- version) ".src.tar.xz")) (define %llvm-release-monitoring-url "https://github.com/llvm/llvm-project/releases") @@ -223,7 +225,7 @@ (define* (clang-from-llvm llvm clang-runtime hash (invoke "tar" "xf" extra) (rename-file ,(string-append "clang-tools-extra-" - (package-version llvm) + (string-delete #\- (package-version llvm)) ".src") "tools/extra") #t))) -- 2.34.0