From patchwork Fri Apr 29 05:17:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 39001 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 5CE9427BBEA; Fri, 29 Apr 2022 06:18:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 119CB27BBE9 for ; Fri, 29 Apr 2022 06:18:24 +0100 (BST) Received: from localhost ([::1]:34932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkJ1L-0007Ow-8D for patchwork@mira.cbaines.net; Fri, 29 Apr 2022 01:18:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkJ12-000718-B2 for guix-patches@gnu.org; Fri, 29 Apr 2022 01:18:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkJ11-0000bM-UW for guix-patches@gnu.org; Fri, 29 Apr 2022 01:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nkJ11-000789-QA for guix-patches@gnu.org; Fri, 29 Apr 2022 01:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55179] [WIP PATCH 04/30] gnu: moarvm: Update to 2022.04. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Apr 2022 05:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55179 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55179@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 55179-submit@debbugs.gnu.org id=B55179.165120946727335 (code B ref 55179); Fri, 29 Apr 2022 05:18:03 +0000 Received: (at 55179) by debbugs.gnu.org; 29 Apr 2022 05:17:47 +0000 Received: from localhost ([127.0.0.1]:50575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ0k-00076o-PI for submit@debbugs.gnu.org; Fri, 29 Apr 2022 01:17:46 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:31546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ0j-00076U-4b for 55179@debbugs.gnu.org; Fri, 29 Apr 2022 01:17:45 -0400 Date: Fri, 29 Apr 2022 05:17:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651209459; bh=9BtfaJLNf+fKdrQXnimyHSx/ebYEAk9y/gvHd4UMufo=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=Uts/0HKLHg8dsbDxrmC4KynW0HPtpPzJfzu8KmcXFzxrA5utE4Tx9YH8TGKhOm4H+ EHrwRCtU7uQjAtJGcbgL49Ha5JxBVq3rvVNoMMlg533MFU88CgsivQ5jc5xeR4s4/l c5o679AMa54tOJVoLxkuSwIZq++e7y7YvUW39DJkEl1JrW5ozwuFo5rZ4IU4jf/AaN pYVtErb43nNxyKv9wmRMZK6hx8zQhHXureV0a2eKvf/b9tdYAQ9Nb+qQ/lhQERxnMf 06HC09oBBeNQDHsX3Z0mvlitk6mYb4RluJNeVAPgyNXQTNKL7KEVgEETpjEhHUj5Rp pQr6MzTzsC+1A== From: "Paul A. Patience" Message-ID: <20220429051700.373076-4-paul@apatience.com> In-Reply-To: <20220429051700.373076-1-paul@apatience.com> References: <20220429051700.373076-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" 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 2022.04. [arguments]: Add 'fix-build' phase. [propagated-inputs]: Use latest libtommath. Move below native-inputs. --- gnu/packages/perl6.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) -- 2.36.0 diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 052d4e0914..35652cda17 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -34,15 +34,14 @@ (define-module (gnu packages perl6) (define-public moarvm (package (name "moarvm") - (version "2019.03") + (version "2022.04") (source (origin (method url-fetch) (uri (string-append "https://moarvm.org/releases/MoarVM-" version ".tar.gz")) (sha256 - (base32 - "017w1zvr6yl0cgjfc1b3ddlc6vjw9q8p7alw1vvsckw95190xc14")) + (base32 "0128fxqaz7cwjf6amaz2cgd7xl52zvi5fr7bwnj229snll5za1mf")) (modules '((guix build utils))) (snippet '(begin @@ -57,6 +56,10 @@ (define-public moarvm (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "build/Makefile.in" + (("^ +3rdparty/freebsd/.*") "")))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -71,11 +74,11 @@ (define-public moarvm "--has-libffi" "--has-libuv"))))))) (home-page "https://moarvm.org/") - ;; These should be inputs but moar.h can't find them when building rakudo - (propagated-inputs - (list libatomic-ops libffi libtommath-1.0 libuv)) (native-inputs (list pkg-config)) + ;; These should be inputs but moar.h can't find them when building Rakudo. + (propagated-inputs + (list libatomic-ops libffi libtommath libuv)) (synopsis "VM for NQP And Rakudo Perl 6") (description "Short for \"Metamodel On A Runtime\", MoarVM is a modern virtual machine