From d76cfc92dacd139fa565878a9a8e610c552094ef Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 3 Feb 2022 20:47:35 +0000 Subject: gnu: LLVM: Support release candidates as version. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (llvm-uri, clang-from-llvm): Support release candidates as version. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/llvm.scm') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0b7800734c..b6d52402a8 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -100,8 +100,10 @@ as \"x86_64-linux\"." ("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") @@ -224,7 +226,7 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the (invoke "tar" "xf" extra) (rename-file ,(string-append "clang-tools-extra-" - (package-version llvm) + (string-delete #\- (package-version llvm)) ".src") "tools/extra") #t))) -- cgit v1.2.3