From patchwork Tue Dec 1 04:15:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 25502 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 D6EB127BBF9; Tue, 1 Dec 2020 04:16:36 +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 A3A6127BBF8 for ; Tue, 1 Dec 2020 04:16:36 +0000 (GMT) Received: from localhost ([::1]:40014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjx5f-00016L-Sp for patchwork@mira.cbaines.net; Mon, 30 Nov 2020 23:16:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjx59-0000sw-Db for guix-patches@gnu.org; Mon, 30 Nov 2020 23:16:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjx59-0007AN-5X for guix-patches@gnu.org; Mon, 30 Nov 2020 23:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjx58-0002qj-TS for guix-patches@gnu.org; Mon, 30 Nov 2020 23:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44978] [PATCH 2/3] gnu: vlang: Use system tiny-bignum. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Dec 2020 04:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44978@debbugs.gnu.org Received: via spool by 44978-submit@debbugs.gnu.org id=B44978.160679613110892 (code B ref 44978); Tue, 01 Dec 2020 04:16:02 +0000 Received: (at 44978) by debbugs.gnu.org; 1 Dec 2020 04:15:31 +0000 Received: from localhost ([127.0.0.1]:57400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjx4d-0002pc-6e for submit@debbugs.gnu.org; Mon, 30 Nov 2020 23:15:31 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:21621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjx4b-0002pA-HL for 44978@debbugs.gnu.org; Mon, 30 Nov 2020 23:15:29 -0500 Date: Tue, 01 Dec 2020 04:15:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1606796123; bh=+KMMLVkj4xDLZSb+UM38swaV0PY1rwN3wuscyt3BGUQ=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=q0g1MjznyROBqP86c+ciSrT1AAEVrAv1dBKNXIgiLPeJt10pUySmP7t+cSyxWa/+Z XaugfAsNGv2win0aP1JWHnvOCUyw+W/Mwa1/EpWlFl1Sdod5cyKvh5VuXjUuV2sTf8 8DCW2sjen+wKROdx/VQyj34Z5l3zBe2x2kaunMGw= Message-ID: <20201201041510.8476-2-rprior@protonmail.com> In-Reply-To: <20201201041510.8476-1-rprior@protonmail.com> References: <20201201041510.8476-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): Update to use system tiny-bignum. --- gnu/packages/vlang.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index 655a77fadc..83bacfc6c3 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -21,6 +21,7 @@ (define-module (gnu packages vlang) #:use-module (gnu packages glib) #:use-module (gnu packages linux) + #:use-module (gnu packages maths) #:use-module (gnu packages node) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) @@ -56,7 +57,12 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0adpjmb8ak4hsbm7iqrx4b5s1a99sc9byg5ah6c1whhsxm781k9r")))) + (base32 "0adpjmb8ak4hsbm7iqrx4b5s1a99sc9byg5ah6c1whhsxm781k9r")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Eventually remove the whole thirdparty directory. + (delete-file-recursively "thirdparty/bignum"))))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -71,10 +77,13 @@ #:phases (modify-phases %standard-phases (delete 'configure) - (add-before 'build 'patch-makefile - (lambda _ + (add-before 'build 'patch-files + (lambda* (#:key inputs #:allow-other-keys) (substitute* "Makefile" - (("rm -rf") "true")))) + (("rm -rf") "true")) + (substitute* "vlib/math/big/big.v" + (("@VROOT/thirdparty/bignum") + (string-append (assoc-ref inputs "tiny-bignum") "/share"))))) (add-before 'build 'patch-cc (lambda _ (let* ((bin "tmp/bin") @@ -128,7 +137,8 @@ (copy-recursively "vlib" vlib) (copy-file "v.mod" vmod))))))) (inputs - `(("glib" ,glib))) + `(("glib" ,glib) + ("tiny-bignum" ,tiny-bignum))) (native-inputs `(("vc" ;; Versions are not consistently tagged, but the matching commit will