From: Julien Lepiller <julien@lepiller.eu>
To: 54239@debbugs.gnu.org
Subject: [bug#54239] [PATCH v3 08/10] gnu: Add libcxxabi-9.
Date: Sat, 16 Jul 2022 21:48:05 +0200 [thread overview]
Message-ID: <20220716194807.20378-8-julien@lepiller.eu> (raw)
In-Reply-To: <20220716194807.20378-1-julien@lepiller.eu>
* gnu/packages/llvm.scm (libcxxabi-9): New variable.
(libcxxabi-6): Inherit from it.
---
gnu/packages/llvm.scm | 66 +++++++++++++++++++++++++++++++------------
1 file changed, 48 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index ba48897c8b..77c3ab73e0 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1685,20 +1685,17 @@ (define-public libcxx-6
"0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"))))
(inputs (list llvm-6))))
-(define-public libcxxabi-6
+(define-public libcxxabi-9
(package
(name "libcxxabi")
- (version "6.0.1")
+ (version (package-version clang-9))
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/llvm/llvm-project")
- (commit (string-append "llvmorg-" version))))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (llvm-uri "libcxxabi" version))
(sha256
(base32
- "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g"))))
+ "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@@ -1709,8 +1706,6 @@ (define-public libcxxabi-6
"-DCMAKE_CXX_COMPILER=clang++")
#:phases
(modify-phases (@ (guix build cmake-build-system) %standard-phases)
- (add-after 'unpack 'chdir
- (lambda _ (chdir "libcxxabi")))
(add-after 'unpack 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(define (delete* what lst)
@@ -1744,10 +1739,10 @@ (define (delete* what lst)
(string-append gcc "/include/c++"))
(string-split (getenv "CROSS_CPLUS_INCLUDE_PATH")
#\:)))
- ":"))
- (format #true
- "environment variable `CROSS_CPLUS_INCLUDE_PATH' changed to ~a~%"
- (getenv "CROSS_CPLUS_INCLUDE_PATH")))
+ ":")))
+ (format #true
+ "environment variable `CROSS_CPLUS_INCLUDE_PATH' changed to ~a~%"
+ (getenv "CROSS_CPLUS_INCLUDE_PATH"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH")))))
@@ -1755,10 +1750,15 @@ (define (delete* what lst)
(lambda* (#:key outputs #:allow-other-keys)
(let ((include-dir (string-append
(assoc-ref outputs "out") "/include")))
- (install-file "../libcxxabi/include/__cxxabi_config.h" include-dir)
- (install-file "../libcxxabi/include/cxxabi.h" include-dir)))))))
- (inputs (list llvm-6 libcxx-6))
- (native-inputs (list (clang-for-target clang-6)))
+ (mkdir-p include-dir)
+ (install-file ,(string-append "../libcxxabi-" version
+ ".src/include/__cxxabi_config.h")
+ include-dir)
+ (install-file ,(string-append "../libcxxabi-" version
+ ".src/include/cxxabi.h")
+ include-dir)))))))
+ (inputs (list llvm-9 libcxx))
+ (native-inputs (list (clang-for-target clang-9)))
(home-page "https://libcxxabi.llvm.org")
(synopsis "C++ standard library support")
(description
@@ -1766,6 +1766,36 @@ (define (delete* what lst)
standard C++ library.")
(license license:expat)))
+(define-public libcxxabi-6
+ (package
+ (inherit libcxxabi-9)
+ (name "libcxxabi")
+ (version "6.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/llvm/llvm-project")
+ (commit (string-append "llvmorg-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments libcxxabi-9)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "libcxxabi")))
+ (replace 'install-headers
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((include-dir (string-append
+ (assoc-ref outputs "out") "/include")))
+ (install-file "../libcxxabi/include/__cxxabi_config.h" include-dir)
+ (install-file "../libcxxabi/include/cxxabi.h" include-dir))))))))
+ (inputs (list llvm-6 libcxx-6))
+ (native-inputs (list (clang-for-target clang-6)))))
+
(define-public libcxx+libcxxabi-6
(package
(inherit libcxx-6)
--
2.37.0
next prev parent reply other threads:[~2022-07-16 19:50 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 ` Julien Lepiller [this message]
2022-07-16 19:48 ` [bug#54239] [PATCH v3 09/10] gnu: Add libcxx-12 Julien Lepiller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220716194807.20378-8-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 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.