From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: 40469@debbugs.gnu.org
Subject: [bug#40469] [PATCH core-updates v2 2/2] gnu: unicorn: Use python-build-system with grace.
Date: Sun, 21 Jun 2020 03:27:49 +0200 [thread overview]
Message-ID: <20200621012749.3742-2-kuba@kadziolka.net> (raw)
In-Reply-To: <20200621012749.3742-1-kuba@kadziolka.net>
* 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 ab5b662915..0e83d7e82c 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)
--
2.26.2
next prev parent reply other threads:[~2020-06-21 1:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 14:48 [bug#40469] [PATCH core-updates] build-system/python: Add a #:python-output argument Jakub Kądziołka
2020-05-29 1:32 ` Leo Famulari
2020-06-21 1:27 ` [bug#40469] [PATCH core-updates v2 1/2] build-system/python: Install to the python output if present Jakub Kądziołka
2020-06-21 1:27 ` Jakub Kądziołka [this message]
[not found] ` <handler.40469.B.15861844998286.ack@debbugs.gnu.org>
2020-07-18 16:16 ` bug#40469: [PATCH core-updates] build-system/python: Add a #:python-output argument Jakub Kądziołka
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=20200621012749.3742-2-kuba@kadziolka.net \
--to=kuba@kadziolka.net \
--cc=40469@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).