From patchwork Sat Apr 29 21:43:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49693 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 F186527BBEA; Sat, 29 Apr 2023 22:55:47 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 0511327BBE2 for ; Sat, 29 Apr 2023 22:55:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pssX3-0002EB-75; Sat, 29 Apr 2023 17:55:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pssX1-0002DG-Fs for guix-patches@gnu.org; Sat, 29 Apr 2023 17:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pssX0-00060c-ND for guix-patches@gnu.org; Sat, 29 Apr 2023 17:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pssX0-0007xi-9l for guix-patches@gnu.org; Sat, 29 Apr 2023 17:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63180] [PATCH 1/2] gnu: armips: Update to 0.11.0-1-6719ede. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Apr 2023 21:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63180@debbugs.gnu.org Received: via spool by 63180-submit@debbugs.gnu.org id=B63180.168280527430519 (code B ref 63180); Sat, 29 Apr 2023 21:55:02 +0000 Received: (at 63180) by debbugs.gnu.org; 29 Apr 2023 21:54:34 +0000 Received: from localhost ([127.0.0.1]:36798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pssWY-0007wA-7Z for submit@debbugs.gnu.org; Sat, 29 Apr 2023 17:54:34 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:51672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pssWW-0007vw-Es for 63180@debbugs.gnu.org; Sat, 29 Apr 2023 17:54:33 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-50b81730426so844727a12.3 for <63180@debbugs.gnu.org>; Sat, 29 Apr 2023 14:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682805266; x=1685397266; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=bTcjVSGmoqTuKyLc3D49Z+FdZ/4zmyBEzclaauHGbYo=; b=jxvKqpUX9OhYprMUW7/3Hn9A6ZxJ+uhvC0HeXD+t0lLhtMzRbl1v20O0L8HfixVWjx J+3ccOYejHZUhyKAF8wFU2Dw45tg0n2BGh5IOW0sVbJUC7cJd4dZn2suh1UI49aZIOmj BQUiLWnUOuzjJ4lti6Uf/no7QFHmolXSt+RA5ozcCbtQUjYJg8d72EmdLe+jWJAi5Igl AgS5yyyLU7ysgwyM9K6qsbo3cZu991FqzNk+9TIQAGHjLA9+T39TbZioMEC4pQ3681+h XZ27nkhgr7goxmskC1WBUMzgGH8xSeQS+tB/uxAWUctAlBcsgpfwGAYqRFd8bQxdh5sE MSHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682805266; x=1685397266; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bTcjVSGmoqTuKyLc3D49Z+FdZ/4zmyBEzclaauHGbYo=; b=Wo1kGN8ZqVuiJbftdkSLULjVf65paAa3o8cC2nZTWdqVQ3H3gZdJCZZlRmgRCscOWs v/dAf88AoEyYe+8OzvT4/bIlMYPkMF20e04FRXjG7kpiXBIhCRDL1GAzU5uyYiK4jlXg wwt+eAl4wLxZsWx49D22Gm5Cf8RUbjJa1f9NSXMSYcgn3i5Pkvc+/yLK0nSX4LWalkZi v4YgfenxpohvkmuJhCTiLmmm2m9m9R4Mut7XQFk8DSykG3msUV/5N6d86QYcTsUTep4C WV+MQtiX3pwAuY1sHo3rbML8BlSqC6g4v/UMuKAYwYwFxdTKqTdButiZqvD34qXxEXla grLQ== X-Gm-Message-State: AC+VfDw/Ldv0RFtdJWE5ZbXdXb9d04NEXRMwYnP2BNh/nesjCrtbtWOm INFlDUQOvIQda5JmeI+9yer+zQie2l5KBA== X-Google-Smtp-Source: ACHHUZ7eZT2apgpTnIFBzpY9WO84pZuEdgy8egElcu/h2eiPRitGkZjqLZwFoMWLyW48hGMbymYg6A== X-Received: by 2002:a05:6402:70b:b0:506:843f:2f27 with SMTP id w11-20020a056402070b00b00506843f2f27mr2376812edx.11.1682805266404; Sat, 29 Apr 2023 14:54:26 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id bj1-20020a170906b04100b0094f7acbafe0sm11986179ejb.177.2023.04.29.14.54.25 for <63180@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 14:54:26 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 29 Apr 2023 23:43:43 +0200 MIME-Version: 1.0 Message-ID: <7f1f76e6094afeda19abf3c47303a537889772d8.camel@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/assembly.scm (armips): Update to 0.11.0-1-6719ede. [source]: Add snippet to fix “Core/Types.h”. [arguments]<#:configure-flags>: Add “-DARMIPS_USE_STD_FILESYSTEM=ON”. --- gnu/packages/assembly.scm | 69 +++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index ff8fe69e64..03a868690c 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -37,6 +37,7 @@ (define-module (gnu packages assembly) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -420,38 +421,48 @@ (define-public xa (license license:gpl2))) (define-public armips - (package - (name "armips") - (version "0.11.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Kingcom/armips") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1c4dhjkvynqn9xm2vcvwzymk7yg8h25alnawkz4z1dnn1z1k3r9g")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys) - (invoke "./armipstests" "../source/Tests"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (install-file "armips" (string-append (assoc-ref outputs "out") - "/bin")) - #t))))) - (home-page "https://github.com/Kingcom/armips") - (synopsis "Assembler for various ARM and MIPS platforms") - (description - "armips is an assembler with full support for the MIPS R3000, MIPS R4000, + (let ((commit "6719edebaae03330ee5441d9b28280672edf00d5") + (revision "1")) + (package + (name "armips") + (version "0.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kingcom/armips") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a85h2b3r3hy9hm07v8drvkklp4qfdq3i3zwb3cgk011s0njdfvz")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "Core/Types.h" + (("#include " all) + (string-append all "\n" + "#include "))))))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DARMIPS_USE_STD_FILESYSTEM=ON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (invoke "./armipstests" "../source/Tests"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "armips" (string-append (assoc-ref outputs "out") + "/bin")) + #t))))) + (home-page "https://github.com/Kingcom/armips") + (synopsis "Assembler for various ARM and MIPS platforms") + (description + "armips is an assembler with full support for the MIPS R3000, MIPS R4000, Allegrex and RSP instruction sets, partial support for the EmotionEngine instruction set, as well as complete support for the ARM7 and ARM9 instruction sets, both THUMB and ARM mode.") - (license license:expat))) + (license license:expat)))) (define-public intel-xed (package