From patchwork Fri Jan 1 19:27:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 26160 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 E0BAA27BC08; Fri, 1 Jan 2021 19:28:16 +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 F2CB627BC09 for ; Fri, 1 Jan 2021 19:28:15 +0000 (GMT) Received: from localhost ([::1]:49714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvQ5v-0003Jm-4E for patchwork@mira.cbaines.net; Fri, 01 Jan 2021 14:28:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvQ5k-0003JF-97 for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvQ5i-0006mG-In for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvQ5i-00052d-G4 for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45601] [PATCH 3/6] gnu: vlang: Use system tiny-bignum. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Jan 2021 19:28:02 +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.160952925919300 (code B ref 45601); Fri, 01 Jan 2021 19:28:02 +0000 Received: (at 45601) by debbugs.gnu.org; 1 Jan 2021 19:27:39 +0000 Received: from localhost ([127.0.0.1]:34902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5L-000518-C8 for submit@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:39 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:56231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5I-00050O-Rk for 45601@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:37 -0500 Date: Fri, 01 Jan 2021 19:27:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609529250; bh=A8agq+955CdOhLsuibBozFd85vjKt9vE/qPjnQFfp1A=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=Az8xs3uUlQ+rAriHfKHkfYJNDyBFBhurPEkqACJfCuR3Gm+jsCgy2LFDc0dMdW4vR mQPEC1WI4y4EnBJBVX96dhDqYtYP26k7P1Fw9rucPofWjqbUfyj5cErd4M980UGLrP KiyUOKN4ruiAynh5oaWz5cHsWoVlaUDm9IqwxlNw= Message-ID: <20210101192713.23655-3-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): 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 212862cb1d..a2f6e93945 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) @@ -57,7 +58,12 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x2sf2j6xl11kjvv0i0anjqwsfb1la11xr7yhdnbix9808442wm2")))) + (base32 "1x2sf2j6xl11kjvv0i0anjqwsfb1la11xr7yhdnbix9808442wm2")) + (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 @@ -72,11 +78,14 @@ #: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") - (("--branch") "")))) + (("--branch") "")) + (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") @@ -135,7 +144,8 @@ (copy-file "v.mod" vmod)) #t))))) (inputs - `(("glib" ,glib))) + `(("glib" ,glib) + ("tiny-bignum" ,tiny-bignum))) (native-inputs `(("vc" ;; Versions are not consistently tagged, but the matching commit will