From: Ryan Prior via Guix-patches via <guix-patches@gnu.org>
To: 45601@debbugs.gnu.org
Subject: [bug#45601] [PATCH 5/6] gnu: vlang: Use system wyhash.
Date: Fri, 01 Jan 2021 19:27:31 +0000 [thread overview]
Message-ID: <20210101192713.23655-5-rprior@protonmail.com> (raw)
In-Reply-To: <20210101192713.23655-1-rprior@protonmail.com>
* gnu/packages/vlang.scm (vlang) Use system wyhash.
---
gnu/packages/vlang.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm
index db7438d7f7..92d178a3e1 100644
--- a/gnu/packages/vlang.scm
+++ b/gnu/packages/vlang.scm
@@ -19,6 +19,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages vlang)
+ #:use-module (gnu packages datastructures)
#:use-module (gnu packages glib)
#:use-module (gnu packages linux)
#:use-module (gnu packages maths)
@@ -63,8 +64,10 @@
(snippet
'(begin
;; Eventually remove the whole thirdparty directory.
- (delete-file-recursively "thirdparty/bignum")
- (delete-file-recursively "thirdparty/cJSON")))))
+ (for-each delete-file-recursively
+ '("thirdparty/bignum"
+ "thirdparty/cJSON"
+ "thirdparty/wyhash"))))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@@ -89,7 +92,10 @@
(string-append (assoc-ref inputs "tiny-bignum") "/share")))
(substitute* "vlib/json/json_primitives.v"
(("@VROOT/thirdparty/cJSON")
- (assoc-ref inputs "cJSON")))))
+ (assoc-ref inputs "cJSON")))
+ (substitute* "vlib/hash/wyhash.c.v"
+ (("@VROOT/thirdparty/wyhash")
+ (string-append (assoc-ref inputs "wyhash") "/include")))))
(add-before 'build 'patch-cc
(lambda _
(let* ((bin "tmp/bin")
@@ -150,7 +156,8 @@
(inputs
`(("glib" ,glib)
("tiny-bignum" ,tiny-bignum)
- ("cJSON" ,(package-source cjson))))
+ ("cJSON" ,(package-source cjson))
+ ("wyhash" ,wyhash)))
(native-inputs
`(("vc"
;; Versions are not consistently tagged, but the matching commit will
--
2.29.2
next prev parent reply other threads:[~2021-01-01 19:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-01 19:23 [bug#45601] [PATCH 0/6] vlang 0.2 update Ryan Prior via Guix-patches via
2021-01-01 19:27 ` [bug#45601] [PATCH 1/6] gnu: Add wyhash Ryan Prior via Guix-patches via
2021-01-01 19:27 ` [bug#45601] [PATCH 2/6] gnu: vlang: Update to 0.2 Ryan Prior via Guix-patches via
2021-01-01 19:27 ` [bug#45601] [PATCH 3/6] gnu: vlang: Use system tiny-bignum Ryan Prior via Guix-patches via
2021-01-01 19:27 ` [bug#45601] [PATCH 4/6] gnu: vlang: Use system cJSON Ryan Prior via Guix-patches via
2021-01-01 19:27 ` Ryan Prior via Guix-patches via [this message]
2021-01-01 19:27 ` [bug#45601] [PATCH 6/6] gnu: vlang: Fix v tools Ryan Prior via Guix-patches via
2021-01-01 20:46 ` [bug#45601] [PATCH 1/6] gnu: Add wyhash Leo Famulari
2021-01-01 21:19 ` [bug#45601] [PATCH] " Ryan Prior via Guix-patches via
2021-01-04 2:07 ` Leo Famulari
2021-01-03 0:09 ` [bug#45601] [PATCH] gnu: vlang: Update to 0.2 Ryan Prior via Guix-patches via
2021-01-04 1:46 ` [bug#45601] [PATCH 0/2] Another vlang dependency plucked out (re: bug#45601) Ryan Prior via Guix-patches via
2021-01-04 1:46 ` [bug#45601] [PATCH 1/2] gnu: Add picoev Ryan Prior via Guix-patches via
2021-01-04 1:46 ` [bug#45601] [PATCH 2/2] gnu: vlang: Use system picoenv Ryan Prior via Guix-patches via
2021-01-04 2:57 ` [bug#45601] [PATCH] gnu: Add wyhash Ryan Prior via Guix-patches via
2021-01-04 3:07 ` [bug#45601] [PATCH 0/1] Updated picoev patch based on feedback Ryan Prior via Guix-patches via
2021-01-04 3:07 ` [bug#45601] [PATCH 1/1] gnu: Add picoev Ryan Prior via Guix-patches via
2021-02-05 13:30 ` Christopher Baines
2024-06-10 16:19 ` Maxim Cournoyer
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=20210101192713.23655-5-rprior@protonmail.com \
--to=guix-patches@gnu.org \
--cc=45601@debbugs.gnu.org \
--cc=rprior@protonmail.com \
/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).