diff mbox series

[bug#46352,2/4] gnu: moarvm: Update to 2020.12.

Message ID 20210206213511.11551-2-brown121407@posteo.ro
State New
Headers show
Series Update Raku (Perl 6) | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Alexandru-Sergiu Marton Feb. 6, 2021, 9:35 p.m. UTC 
* gnu/packages/perl6.scm (moarvm): Update to 2020.12.
---
 gnu/packages/perl6.scm | 57 ++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

Comments

Ludovic Courtès March 20, 2021, 9:07 p.m. UTC | #1 
Hi,

Alexandru-Sergiu Marton <brown121407@posteo.ro> skribis:

> * gnu/packages/perl6.scm (moarvm): Update to 2020.12.

[...]

> -            ;(delete-file-recursively "3rdparty/dynasm") ; JIT
> -            (delete-file-recursively "3rdparty/dyncall")
> -            (delete-file-recursively "3rdparty/freebsd")

Apparently the 1st and 3rd line here are removed.

Is 3rdparty/freebsd being used now?  If there an opportunity for
unbundling?  If not, that’s OK.

Regarding dynasm, I think it’s best to keep the line commented out as a
reminder of what’s left to unbundle, if that’s still applicable.

Nitpick: could you mention in the commit log the modified fields:
‘inputs’, ‘arguments’, and ‘source’.  That often helps fellow reviewers
read the diff.  :-)

BTW, said reviewers have been so slow that there’s apparently a newer
version available now.  Apologies!

Thanks in advance,
Ludo’.
Alexandru-Sergiu Marton March 22, 2021, 9:04 a.m. UTC | #2 
Ludovic Courtès writes:

> Is 3rdparty/freebsd being used now?  If there an opportunity for
> unbundling?  If not, that’s OK.

Don't really remember what was the deal with that, I'll investigate.

> Regarding dynasm, I think it’s best to keep the line commented out as a
> reminder of what’s left to unbundle, if that’s still applicable.

Will do.

> Nitpick: could you mention in the commit log the modified fields:
> ‘inputs’, ‘arguments’, and ‘source’.  That often helps fellow reviewers
> read the diff.  :-)

Sure.

> BTW, said reviewers have been so slow that there’s apparently a newer
> version available now.  Apologies!

No problem. I have some test recipes for the latest version on my
channel, https://git.sr.ht/~brown121407/guix-channel , I'll try to put
them into Guix proper and check the dependent packages when I have the
time the following weeks.

Cheers.
Ludovic Courtès March 23, 2021, 10:32 a.m. UTC | #3 
Hi,

Alexandru-Sergiu Marton <brown121407@posteo.ro> skribis:

> No problem. I have some test recipes for the latest version on my
> channel, https://git.sr.ht/~brown121407/guix-channel , I'll try to put
> them into Guix proper and check the dependent packages when I have the
> time the following weeks.

Excellent.  Thanks and again apologies for the delay!

Ludo’.
diff mbox series

Patch

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