* [bug#53787] [PATCH] gnu: LLVM: Support release candidates as version.
@ 2022-02-04 21:17 Greg Hogan
2022-02-10 22:23 ` bug#53787: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Greg Hogan @ 2022-02-04 21:17 UTC (permalink / raw)
To: 53787
[-- Attachment #1.1: Type: text/plain, Size: 2109 bytes --]
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@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
[-- Attachment #1.2: Type: text/html, Size: 2853 bytes --]
[-- Attachment #2: 0001-gnu-LLVM-Support-release-candidates-as-version.patch --]
[-- Type: text/x-patch, Size: 1819 bytes --]
From 11df3eecb2b21575fb96b99561a38b75cfffbc52 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#53787: [PATCH] gnu: LLVM: Support release candidates as version.
2022-02-04 21:17 [bug#53787] [PATCH] gnu: LLVM: Support release candidates as version Greg Hogan
@ 2022-02-10 22:23 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2022-02-10 22:23 UTC (permalink / raw)
To: Greg Hogan; +Cc: 53787-done
Greg Hogan <code@greghogan.com> skribis:
> From 11df3eecb2b21575fb96b99561a38b75cfffbc52 Mon Sep 17 00:00:00 2001
> From: Greg Hogan <code@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’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-10 22:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-04 21:17 [bug#53787] [PATCH] gnu: LLVM: Support release candidates as version Greg Hogan
2022-02-10 22:23 ` bug#53787: " Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.