mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 23:36:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: p7zip: Adjust custom configure phase.

Browse source 
* gnu/packages/compression.scm (p7zip)[arguments]: Use new target macros
to simplify custom 'configure phase.
This commit is contained in:
Efraim Flashner 2021-08-08 10:57:27 +03:00
parent de0954d18c
commit 86fd77476d
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/compression.scm
View file

@ -1334,18 +1334,15 @@ (define-public p7zip
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key system outputs #:allow-other-keys) (lambda _
(invoke "cp" (copy-file
(let ((system ,(or (%current-target-system) ,(cond ((target-x86-64?)
(%current-system)))) "makefile.linux_amd64_asm")
(cond ((target-x86-32?)
((string-prefix? "x86_64" system) "makefile.linux_x86_asm_gcc_4.X")
"makefile.linux_amd64_asm") (else
((string-prefix? "i686" system) "makefile.linux_any_cpu_gcc_4.X"))
"makefile.linux_x86_asm_gcc_4.X") "makefile.machine")))
(else
"makefile.linux_any_cpu_gcc_4.X")))
"makefile.machine")))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?