GNU bug report logs - #53787
[PATCH] gnu: LLVM: Support release candidates as version.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53787 in the body.
You can then email your comments to 53787 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: LLVM: Support release candidates as version.
Date: Fri, 4 Feb 2022 16:17:39 -0500

[Message part 1 (text/plain, inline)]

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 <code <at> greghogan.com>
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

[Message part 2 (text/html, inline)]

[0001-gnu-LLVM-Support-release-candidates-as-version.patch (text/x-patch, attachment)]

Message #10 received at 53787-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>
Cc: 53787-done <at> debbugs.gnu.org
Subject: Re: bug#53787: [PATCH] gnu: LLVM: Support release candidates as
 version.
Date: Thu, 10 Feb 2022 23:23:35 +0100

Greg Hogan <code <at> greghogan.com> skribis:

> From 11df3eecb2b21575fb96b99561a38b75cfffbc52 Mon Sep 17 00:00:00 2001
> From: Greg Hogan <code <at> greghogan.com>
> 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.

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.