From: Liliana Prikler <liliana.prikler@gmail.com>
To: 47006@debbugs.gnu.org
Cc: maximedevos@telenet.be, efraim@flashner.co.il
Subject: [bug#47006] [PATCH 1/2] gnu: lld: Update to 12.0.0.
Date: Thu, 9 Sep 2021 15:32:20 +0200 [thread overview]
Message-ID: <0f6c5b692df8d06a0d7adddc9e5abf93894a366f.1631195387.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <a1922b0a2ec237d217af54ed3ff7065e360d994c.camel@gmail.com>
* gnu/packages/llvm.scm (llvm-subprojects-origin, %llvm-project-12.0.0-hash):
New variables.
(lld-11, lld-12): New variables.
(lld): Point to lld-11.
---
gnu/packages/llvm.scm | 44 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 4394194939..220116cbfb 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -92,6 +92,22 @@ as \"x86_64-linux\"."
(string-append "https://github.com/llvm/llvm-project/releases/download"
"/llvmorg-" version "/" component "-" version ".src.tar.xz"))
+(define* (llvm-subprojects-origin components version base32-hash
+ #:optional (patches '()))
+ (origin
+ (method url-fetch)
+ (uri (llvm-uri "llvm-project" version))
+ (sha256 base32-hash)
+ (patches (map search-patch patches))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
+ (snippet
+ `(for-each
+ (lambda (file)
+ (unless (member file '("." ".." ,@components))
+ (delete-file-recursively file)))
+ (scandir ".")))))
+
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))
(package
@@ -882,7 +898,7 @@ of programming tools as well as libraries with equivalent functionality.")
(define-public clang clang-9)
(define-public clang-toolchain clang-toolchain-9)
-(define-public lld
+(define-public lld-11
(package
(name "lld")
(version "11.0.0")
@@ -906,6 +922,32 @@ of programming tools as well as libraries with equivalent functionality.")
components which highly leverage existing libraries in the larger LLVM Project.")
(license license:asl2.0))) ; With LLVM exception
+(define %llvm-project-12.0.0-hash
+ (base32 "0a1n88dmbwp1ww7h3ykf0s001cndk1bm3i2cj1y2sh548f4nilcy"))
+
+(define-public lld-12
+ (package
+ (inherit lld-11)
+ (version "12.0.0")
+ (source (llvm-subprojects-origin '("lld" "libunwind") version
+ %llvm-project-12.0.0-hash))
+ (arguments
+ `(,@(package-arguments lld-11)
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'dissect
+ (lambda _
+ ;; Find libunwind in unpacked sources
+ (substitute* "lld/MachO/CMakeLists.txt"
+ (("\\$\\{LLVM_MAIN_SRC_DIR\\}/\\.\\./libunwind")
+ (string-append (getcwd) "/libunwind")))
+ ;; chdir to actual source folder
+ (chdir "lld"))))))
+ (inputs
+ `(("llvm" ,llvm-12)))))
+
+(define-public lld lld-11)
+
(define-public lldb
(package
(name "lldb")
--
2.33.0
next prev parent reply other threads:[~2021-09-09 13:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <a1922b0a2ec237d217af54ed3ff7065e360d994c.camel@gmail.com>
2021-09-09 1:43 ` [bug#50449] [PATCH] Add zig Andrew Patterson
2021-09-09 13:32 ` Liliana Prikler [this message]
2021-09-09 13:32 ` [bug#47006] [PATCH 2/2] gnu: " Liliana Prikler
2021-09-09 16:31 ` [bug#50449] " Sarah Morgensen
2021-09-09 18:18 ` Liliana Marie Prikler
2021-09-09 18:49 ` [bug#47006] [bug#50449] " Sarah Morgensen
2021-09-09 13:32 ` [bug#47006] [WIP PATCH v2 " Liliana Prikler
[not found] ` <0f6c5b692df8d06a0d7adddc9e5abf93894a366f.1631226695.git.liliana.prikler@gmail.com>
2021-09-11 9:52 ` iskarian
2021-09-11 19:24 ` Sarah Morgensen
2021-09-11 20:01 ` [bug#39480] " Liliana Marie Prikler
2021-09-12 4:42 ` Sarah Morgensen
2021-09-12 7:32 ` Liliana Marie Prikler
2021-09-12 7:39 ` Liliana Marie Prikler
2021-09-12 22:40 ` Sarah Morgensen
2021-09-14 16:17 ` Liliana Marie Prikler
2021-09-24 0:17 ` [bug#50449] " Sarah Morgensen
2021-09-09 13:32 ` [bug#50449] [PATCH v5] " Liliana Prikler
2021-10-31 8:06 ` [bug#47006] " Liliana Marie Prikler
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f6c5b692df8d06a0d7adddc9e5abf93894a366f.1631195387.git.liliana.prikler@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=47006@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
--cc=maximedevos@telenet.be \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).