From: Greg Hogan <code@greghogan.com>
To: 53787@debbugs.gnu.org
Subject: [bug#53787] [PATCH] gnu: LLVM: Support release candidates as version.
Date: Fri, 4 Feb 2022 16:17:39 -0500 [thread overview]
Message-ID: <CA+3U0Zk8p+YCkj98gBvQmuY8NcSyd_wyZLRRVH+T9veqXkvFxA@mail.gmail.com> (raw)
[-- 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
next reply other threads:[~2022-02-04 21:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 21:17 Greg Hogan [this message]
2022-02-10 22:23 ` bug#53787: [PATCH] gnu: LLVM: Support release candidates as version Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+3U0Zk8p+YCkj98gBvQmuY8NcSyd_wyZLRRVH+T9veqXkvFxA@mail.gmail.com \
--to=code@greghogan.com \
--cc=53787@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.