From patchwork Fri Jan 1 19:27:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 26163 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5733627BC0A; Fri, 1 Jan 2021 19:28:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 89E8827BC09 for ; Fri, 1 Jan 2021 19:28:27 +0000 (GMT) Received: from localhost ([::1]:50312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvQ66-0003ad-PL for patchwork@mira.cbaines.net; Fri, 01 Jan 2021 14:28:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvQ5k-0003JJ-AS for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvQ5j-0006mv-Rm for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvQ5j-000530-Os for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45601] [PATCH 5/6] gnu: vlang: Use system wyhash. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Jan 2021 19:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45601@debbugs.gnu.org Received: via spool by 45601-submit@debbugs.gnu.org id=B45601.160952926419337 (code B ref 45601); Fri, 01 Jan 2021 19:28:03 +0000 Received: (at 45601) by debbugs.gnu.org; 1 Jan 2021 19:27:44 +0000 Received: from localhost ([127.0.0.1]:34910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5Q-00051k-AH for submit@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:44 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:59875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5O-00050h-In for 45601@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:42 -0500 Date: Fri, 01 Jan 2021 19:27:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609529256; bh=imAHnLi8kKL0gWUFqFXKvUCbpANseUAZQHB1Mrg6y0s=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=G5TCLSYFDaRndDuzQPPucFNA6UUc5cHykdYWkiLILZx9C0+IG08x8UEyobG4Gmikj IpNMkIbkgF2IPrbMr5j3jsGC2fEEVLLMI4gP8Pq7CBOIBDblvq46i3UOPBUfeO8F/R YUwhwwinaPMJXltKAr8px7lxLxtydxLzRBW9gklo= Message-ID: <20210101192713.23655-5-rprior@protonmail.com> In-Reply-To: <20210101192713.23655-1-rprior@protonmail.com> References: <20210101192713.23655-1-rprior@protonmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Ryan Prior , Ryan Prior via Guix-patches X-Patchwork-Original-From: Ryan Prior via Guix-patches via From: Ryan Prior X-getmail-retrieved-from-mailbox: Patches * 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 . (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