From patchwork Sat Feb 6 21:35:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 26938 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 EBE0527BC1E; Sat, 6 Feb 2021 21:36:38 +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, 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 CBC9D27BC21 for ; Sat, 6 Feb 2021 21:36:36 +0000 (GMT) Received: from localhost ([::1]:35678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l8VFr-0001ZT-VI for patchwork@mira.cbaines.net; Sat, 06 Feb 2021 16:36:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8VFK-0001LO-Uf for guix-patches@gnu.org; Sat, 06 Feb 2021 16:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l8VFK-0003Fx-Ns for guix-patches@gnu.org; Sat, 06 Feb 2021 16:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l8VFK-0008NG-La for guix-patches@gnu.org; Sat, 06 Feb 2021 16:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46352] [PATCH 2/4] gnu: moarvm: Update to 2020.12. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Feb 2021 21:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46352 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46352@debbugs.gnu.org Cc: Alexandru-Sergiu Marton Received: via spool by 46352-submit@debbugs.gnu.org id=B46352.161264733932144 (code B ref 46352); Sat, 06 Feb 2021 21:36:02 +0000 Received: (at 46352) by debbugs.gnu.org; 6 Feb 2021 21:35:39 +0000 Received: from localhost ([127.0.0.1]:46571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l8VEt-0008MD-Bh for submit@debbugs.gnu.org; Sat, 06 Feb 2021 16:35:39 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l8VEj-0008LV-WF for 46352@debbugs.gnu.org; Sat, 06 Feb 2021 16:35:30 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 2412A16005C for <46352@debbugs.gnu.org>; Sat, 6 Feb 2021 22:35:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1612647320; bh=Rj9tGZyJxuUclcLKyUfqW6GqoSF8ids3XRr/PR3ACUo=; h=From:To:Cc:Subject:Date:From; b=j0NomK/g4YkqiGeuMbciDw3+3AfLdqizLCbVnliDMBPZtGYSMwOUp5l+dyg4G6G5p fGSS0V0jdWVuj+IDTVxkTuLCrVVPl2TgPMH9j8BfmJxQC+Fpi89XWhRFughq6DA3Mr unEkQ00fYeHckJLbgOWe2xLToAc9AMzlhIGhy3keSCa0KFdSmJ07ijqE4PAfFxsi3O Ghg1IVk2tVFRzF7LzYdW7Wu8Idzh0pUpWLLWm+HxizTKm8W4TZFjsXqBRCHrBhaNLQ EIUApLdh1atf+6hL0sxiXgF5JzPpQA7YPhblJv2NrQGdlNhiy2bvBwqMMqJNHLm7Zy UwbspGYl3UcIA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DY5DR4PJ7z6tmF; Sat, 6 Feb 2021 22:35:19 +0100 (CET) From: Alexandru-Sergiu Marton Date: Sat, 6 Feb 2021 23:35:09 +0200 Message-Id: <20210206213511.11551-2-brown121407@posteo.ro> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210206213511.11551-1-brown121407@posteo.ro> References: <20210206213332.11417-1-brown121407@posteo.ro> <20210206213511.11551-1-brown121407@posteo.ro> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/perl6.scm (moarvm): Update to 2020.12. --- gnu/packages/perl6.scm | 57 ++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index e02dd757e5..96d76dd417 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (guix build-system perl) #:use-module (guix build-system rakudo) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages c) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages multiprecision) @@ -34,26 +36,26 @@ (define-public moarvm (package (name "moarvm") - (version "2019.03") + (version "2020.12") (source - (origin - (method url-fetch) - (uri (string-append "https://moarvm.org/releases/MoarVM-" - version ".tar.gz")) - (sha256 - (base32 - "017w1zvr6yl0cgjfc1b3ddlc6vjw9q8p7alw1vvsckw95190xc14")) - (modules '((guix build utils))) - (snippet - '(begin - ;(delete-file-recursively "3rdparty/dynasm") ; JIT - (delete-file-recursively "3rdparty/dyncall") - (delete-file-recursively "3rdparty/freebsd") - (delete-file-recursively "3rdparty/libatomicops") - (delete-file-recursively "3rdparty/libuv") - (delete-file-recursively "3rdparty/libtommath") - (delete-file-recursively "3rdparty/msinttypes") - #t)))) + (origin + (method url-fetch) + (uri (string-append "https://moarvm.org/releases/MoarVM-" + version ".tar.gz")) + (sha256 + (base32 + "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete libraries which we can provide through Guix. + (delete-file-recursively "3rdparty/dyncall") + (delete-file-recursively "3rdparty/libatomicops") + (delete-file-recursively "3rdparty/libuv") + (delete-file-recursively "3rdparty/libtommath") + ;; Useful only for Microsoft Visual Studio. + (delete-file-recursively "3rdparty/msinttypes") + #t)))) (build-system perl-build-system) (arguments '(#:phases @@ -64,19 +66,22 @@ (pkg-config (assoc-ref inputs "pkg-config"))) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) (invoke "perl" "Configure.pl" - "--prefix" out - "--pkgconfig" (string-append pkg-config "/bin/pkg-config") + (string-append "--prefix=" out) + (string-append "--pkgconfig=" pkg-config + "/bin/pkg-config") "--has-libtommath" "--has-libatomic_ops" "--has-libffi" - "--has-libuv"))))))) + "--has-libuv" + "--has-dyncall"))))))) (home-page "https://moarvm.org/") ;; These should be inputs but moar.h can't find them when building rakudo (propagated-inputs `(("libatomic-ops" ,libatomic-ops) ("libffi" ,libffi) - ("libtommath" ,libtommath-1.0) - ("libuv" ,libuv))) + ("libtommath" ,libtommath) + ("libuv" ,libuv) + ("dyncall" ,dyncall))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "VM for NQP And Rakudo Perl 6") @@ -96,7 +101,9 @@ asynchronous sockets, timers, processes, and more exceptions, continuations, runtime loading of code, big integers and interfacing with native libraries. @end itemize") - (license license:artistic2.0))) + (license (list license:artistic2.0 ; For MoarVM itself + license:expat ; 3rdparty/freebsd,tinymt,cmp + license:public-domain)))) ; 3rdparty/sha1 (define-public nqp (package