summary refs log tree commit diff
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2023-04-29 23:43:43 +0200
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2023-05-07 17:55:15 +0200
commitb2b0179ec71a8d2e6686878d873354c599e8c7be (patch)
treea4c9a537821def2d43398526bf578083041452b6
parent3e46970eab1ca17c31ab50b30e4271defc0c5eab (diff)
downloadguix-b2b0179ec71a8d2e6686878d873354c599e8c7be.tar.gz
gnu: armips: Update to 0.11.0-1-6719ede.
* 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”.
-rw-r--r--gnu/packages/assembly.scm69
1 files 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 @@
   #: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 @@ as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...),
     (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 <string>" all)
+                 (string-append all "\n"
+                                "#include <string_view>")))))))
+      (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