guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: p7zip: Adjust custom configure phase.


From: guix-commits
Subject: 03/04: gnu: p7zip: Adjust custom configure phase.
Date: Sun, 8 Aug 2021 04:32:22 -0400 (EDT)

efraim pushed a commit to branch core-updates-frozen
in repository guix.

commit 86fd77476d550796c713d641b8d2397f2f31676e
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 8 10:57:27 2021 +0300

    gnu: p7zip: Adjust custom configure phase.
    
    * gnu/packages/compression.scm (p7zip)[arguments]: Use new target macros
    to simplify custom 'configure phase.
---
 gnu/packages/compression.scm | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 561f134..b68bb7a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1334,18 +1334,15 @@ for most inputs, but the resulting compressed files are 
anywhere from 20% to
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
-           (lambda* (#:key system outputs #:allow-other-keys)
-             (invoke "cp"
-                     (let ((system ,(or (%current-target-system)
-                                        (%current-system))))
-                       (cond
-                        ((string-prefix? "x86_64" system)
-                         "makefile.linux_amd64_asm")
-                        ((string-prefix? "i686" system)
-                         "makefile.linux_x86_asm_gcc_4.X")
-                        (else
-                         "makefile.linux_any_cpu_gcc_4.X")))
-                     "makefile.machine")))
+           (lambda _
+             (copy-file
+               ,(cond ((target-x86-64?)
+                       "makefile.linux_amd64_asm")
+                      ((target-x86-32?)
+                       "makefile.linux_x86_asm_gcc_4.X")
+                      (else
+                        "makefile.linux_any_cpu_gcc_4.X"))
+               "makefile.machine")))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]