From: Julien Lepiller <julien@lepiller.eu>
To: 54239@debbugs.gnu.org
Subject: [bug#54239] [PATCH v3 09/10] gnu: Add libcxx-12.
Date: Sat, 16 Jul 2022 21:48:06 +0200 [thread overview]
Message-ID: <20220716194807.20378-9-julien@lepiller.eu> (raw)
In-Reply-To: <20220716194807.20378-1-julien@lepiller.eu>
* gnu/packages/llvm.scm (libcxx): Rename to...
(libcxx-9): ...this.
(libcxx-12): New variable.
---
gnu/packages/llvm.scm | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 77c3ab73e0..4f0b57a990 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1624,21 +1624,24 @@ (define-public lldb
(properties `((release-monitoring-url . ,%llvm-release-monitoring-url)))
(license license:asl2.0))) ;with LLVM exceptions
-(define-public libcxx
+(define-public libcxx-12
(package
(name "libcxx")
- (version "9.0.1")
+ (version (package-version llvm-12))
(source
(origin
(method url-fetch)
- (uri (llvm-uri "libcxx" version))
+ (uri (llvm-uri "llvm-project" version))
(sha256
(base32
- "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089"))))
+ "03ps7akvbkxxa4xzal49v7lw3bz41zmjsp6fa7cslxrns5fb570j"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases (@ (guix build cmake-build-system) %standard-phases)
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "libcxx")))
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((gcc (or (assoc-ref (or native-inputs inputs) "gcc")))
@@ -1662,7 +1665,8 @@ (define-public libcxx
(format #t
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
- (inputs (list llvm-9))
+ (inputs (list llvm-12))
+ (native-inputs (list python))
(home-page "https://libcxx.llvm.org")
(synopsis "C++ standard library")
(description
@@ -1671,14 +1675,32 @@ (define-public libcxx
(properties `((release-monitoring-url . ,%llvm-release-monitoring-url)))
(license license:expat)))
+(define-public libcxx-9
+ (package
+ (inherit libcxx-12)
+ (version (package-version llvm-9))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (llvm-uri "libcxx" version))
+ (sha256
+ (base32
+ "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments libcxx-12)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'chdir)))))
+ (inputs (list llvm-9))))
+
;; Libcxx files specifically used by PySide2.
(define-public libcxx-6
(package
- (inherit libcxx)
+ (inherit libcxx-9)
(version (package-version llvm-6))
(source
(origin
- (inherit (package-source libcxx))
+ (inherit (package-source libcxx-9))
(uri (llvm-uri "libcxx" version))
(sha256
(base32
@@ -1757,7 +1779,7 @@ (define (delete* what lst)
(install-file ,(string-append "../libcxxabi-" version
".src/include/cxxabi.h")
include-dir)))))))
- (inputs (list llvm-9 libcxx))
+ (inputs (list llvm-9 libcxx-9))
(native-inputs (list (clang-for-target clang-9)))
(home-page "https://libcxxabi.llvm.org")
(synopsis "C++ standard library support")
--
2.37.0
next prev parent reply other threads:[~2022-07-16 19:49 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 16:02 [bug#54239] [PATCH] gnu: Add cross-clang Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 1/5] gnu: Add cross-llvm Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 2/5] gnu: Add cross-clang Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 3/5] gnu: libcxx: Allow cross-compilation Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 4/5] gnu: libcxxabi-6: " Julien Lepiller
2022-03-03 16:07 ` [bug#54239] [PATCH 5/5] gnu: Add libcxxabi-9 Julien Lepiller
2022-03-03 16:40 ` [bug#54239] [PATCH] gnu: Add cross-clang Maxime Devos
2022-03-03 18:35 ` Julien Lepiller
2022-03-03 18:59 ` Maxime Devos
2022-03-03 21:11 ` Julien Lepiller
2022-03-04 20:05 ` Maxime Devos
2022-03-03 20:51 ` Pierre Langlois
2022-03-03 21:20 ` Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 1/5] gnu: Add cross-llvm Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 2/5] gnu: Add cross-clang Julien Lepiller
2022-03-04 19:53 ` Maxime Devos
2022-03-04 19:54 ` Maxime Devos
2022-03-05 8:30 ` Julien Lepiller
2022-03-04 19:56 ` Maxime Devos
2022-03-04 20:00 ` Maxime Devos
2022-03-05 16:05 ` Pierre Langlois
2022-03-04 9:59 ` [bug#54239] [PATCH v2 3/5] gnu: libcxx: Allow cross-compilation Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 4/5] gnu: libcxxabi-6: " Julien Lepiller
2022-03-04 9:59 ` [bug#54239] [PATCH v2 5/5] gnu: Add libcxxabi-9 Julien Lepiller
2022-03-04 19:50 ` Maxime Devos
2022-05-21 13:41 ` [bug#54239] [PATCH] gnu: Add cross-clang Ludovic Courtès
2022-07-16 19:44 ` Julien Lepiller
2022-07-16 19:47 ` [bug#54239] [PATCH v3 01/10] guix: Add build-system transformation for target Julien Lepiller
2022-07-16 19:47 ` [bug#54239] [PATCH v3 02/10] gnu: clang-runtime: Fix cross-compilation Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 03/10] gnu: llvm-9: " Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 04/10] gnu: Add cross-llvm Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 05/10] gnu: Add cross-clang Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 06/10] gnu: libcxx: Allow cross-compilation Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 07/10] gnu: libcxxabi-6: " Julien Lepiller
2022-07-16 19:48 ` [bug#54239] [PATCH v3 08/10] gnu: Add libcxxabi-9 Julien Lepiller
2022-07-16 19:48 ` Julien Lepiller [this message]
2022-07-16 19:48 ` [bug#54239] [PATCH v3 10/10] gnu: Add libcxxabi-12 Julien Lepiller
2022-07-19 19:54 ` [bug#54239] [PATCH] gnu: Add cross-clang Maxime Devos
2022-07-19 20:42 ` Julien Lepiller
2022-03-04 19:34 ` [bug#54239] [PATCH v2 1/5] gnu: Add cross-llvm Pierre Langlois
2022-03-05 8:24 ` Julien Lepiller
2022-03-05 13:02 ` Pierre Langlois
2022-03-05 14:00 ` Pierre Langlois
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=20220716194807.20378-9-julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=54239@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 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).