From: Alexandru-Sergiu Marton <brown121407@posteo.ro>
To: 46352@debbugs.gnu.org
Cc: Alexandru-Sergiu Marton <brown121407@posteo.ro>
Subject: [bug#46352] [PATCH 2/4] gnu: moarvm: Update to 2020.12.
Date: Sat, 6 Feb 2021 23:35:09 +0200 [thread overview]
Message-ID: <20210206213511.11551-2-brown121407@posteo.ro> (raw)
In-Reply-To: <20210206213511.11551-1-brown121407@posteo.ro>
* 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 <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;;
;;; 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
--
2.30.0
next prev parent reply other threads:[~2021-02-06 21:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-06 21:33 [bug#46352] [PATCH 0/4] Update Raku (Perl 6) Alexandru-Sergiu Marton
2021-02-06 21:35 ` [bug#46352] [PATCH 1/4] gnu: Add dyncall Alexandru-Sergiu Marton
2021-02-06 21:35 ` Alexandru-Sergiu Marton [this message]
2021-03-20 21:07 ` [bug#46352] [PATCH 0/4] Update Raku (Perl 6) Ludovic Courtès
2021-03-22 9:04 ` Alexandru-Sergiu Marton
2021-03-23 10:32 ` Ludovic Courtès
2021-02-06 21:35 ` [bug#46352] [PATCH 3/4] gnu: nqp: Update to 2020.12 Alexandru-Sergiu Marton
2021-03-20 21:10 ` [bug#46352] [PATCH 0/4] Update Raku (Perl 6) Ludovic Courtès
2021-02-06 21:35 ` [bug#46352] [PATCH 4/4] gnu: rakudo: Update to 2020.12 Alexandru-Sergiu Marton
2021-03-20 21:08 ` [bug#46352] [PATCH 0/4] Update Raku (Perl 6) Ludovic Courtès
2021-03-20 21:03 ` Ludovic Courtès
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=20210206213511.11551-2-brown121407@posteo.ro \
--to=brown121407@posteo.ro \
--cc=46352@debbugs.gnu.org \
/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).