[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: unicorn: Use python-build-system with grace.
From: |
guix-commits |
Subject: |
02/02: gnu: unicorn: Use python-build-system with grace. |
Date: |
Sat, 18 Jul 2020 11:06:38 -0400 (EDT) |
niedzejkob pushed a commit to branch core-updates
in repository guix.
commit 352e6c8a750c1b995ad8a357caf65eeded7e7774
Author: Jakub Kądziołka <kuba@kadziolka.net>
AuthorDate: Sun Jun 21 03:18:55 2020 +0200
gnu: unicorn: Use python-build-system with grace.
* gnu/packages/emulators.scm (unicorn)[arguments]: Remove the
install-bindings-to-python-output phase. Adjust output names used in
other phases.
---
gnu/packages/emulators.scm | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index ab5b662..0e83d7e 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1700,17 +1700,6 @@ performance, features, and ease of use.")
(guix build utils))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'install-bindings-to-python-output
- (lambda* (#:key outputs #:allow-other-keys)
- ;; python-build-system will build the bindings and install them
to
- ;; the "out" output, so change the build-internal names of the
- ;; outputs.
- ;;
- ;; TODO: remove this once #40469 lands, through the core-updates
- ;; holding zone, on master.
- (set-car! (assoc "out" outputs) "lib")
- (set-car! (assoc "python" outputs) "out")
- #t))
(add-before 'build 'build-library
(lambda* (#:key inputs #:allow-other-keys)
(invoke "make"
@@ -1723,7 +1712,7 @@ performance, features, and ease of use.")
"UNICORN_STATIC=no"
(string-append
"PREFIX="
- (assoc-ref outputs "lib")))))
+ (assoc-ref outputs "out")))))
(add-before 'build 'prepare-bindings
(lambda* (#:key outputs #:allow-other-keys)
(chdir "bindings/python")
@@ -1736,7 +1725,7 @@ performance, features, and ease of use.")
(("_path_list = \\[.*")
(string-append
"_path_list = [\""
- (assoc-ref outputs "lib")
+ (assoc-ref outputs "out")
;; eat the rest of the list
"/lib\"] + 0*[")))
#t))
@@ -1757,10 +1746,10 @@ performance, features, and ease of use.")
(let* ((python-samples (find-files "." "sample_.*"))
(c-samples (find-files "../../samples" ".*\\.c"))
(python-docdir
- (string-append (assoc-ref outputs "out")
+ (string-append (assoc-ref outputs "python")
"/share/doc/unicorn/samples"))
(c-docdir
- (string-append (assoc-ref outputs "lib")
+ (string-append (assoc-ref outputs "out")
"/share/doc/unicorn/samples")))
(for-each (cut install-file <> c-docdir) c-samples)
(for-each (cut install-file <> python-docdir) python-samples)