ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libgpg-error: Refactor package arguments.

Browse source 
* gnu/packages/gnupg.scm (libgpg-error)[arguments]: Move the
configure-flags to be always applied and make the adjustments to the
build phases be the only conditional part.  Remove unneeded module
imports.

Change-Id: I7eb3950e00e78071a148569cb3705e8a2866d0b6
This commit is contained in:
Efraim Flashner 2024-01-24 11:50:43 +02:00 committed by Ludovic Courtès
parent 70e8752020
commit 7990d6db4d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 46 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/gnupg.scm
View file

@ -105,18 +105,16 @@ (define-public libgpg-error
"1nwvpg5inpjzbq7r6wqsgmwcnfqyahcw9hi8discqvmrcq4nfg4y")))) "1nwvpg5inpjzbq7r6wqsgmwcnfqyahcw9hi8discqvmrcq4nfg4y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(cond
((%current-target-system)
(list (list
#:modules '((guix build gnu-build-system)
(guix build utils))
#:configure-flags #~(list "--enable-install-gpg-error-config") #:configure-flags #~(list "--enable-install-gpg-error-config")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
#$@(cond
((%current-target-system)
;; If this is left out, some generated header ;; If this is left out, some generated header
;; files will be sprinkled with ‘\c’, which ;; files will be sprinkled with ‘\c’, which
;; the compiler won't like. ;; the compiler won't like.
(add-after 'unpack 'fix-gen-lock-obj.sh #~((add-after 'unpack 'fix-gen-lock-obj.sh
(lambda _ (lambda _
(substitute* "src/gen-lock-obj.sh" (substitute* "src/gen-lock-obj.sh"
(("if test -n `echo -n`") "if ! test -n `echo -n`")))) (("if test -n `echo -n`") "if ! test -n `echo -n`"))))
@ -145,21 +143,14 @@ (define (link triplet source)
;; configuration, as this is not correct for ;; configuration, as this is not correct for
;; all architectures. ;; all architectures.
(_ #t))) (_ #t)))
(#t #t)))))))) (#t #t)))))))
((system-hurd?) ((system-hurd?)
(list #~((add-after 'unpack 'skip-tests
#:configure-flags #~(list "--enable-install-gpg-error-config")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-tests
(lambda _ (lambda _
(substitute* (substitute* "tests/t-syserror.c"
"tests/t-syserror.c"
(("(^| )main *\\(.*" all) (("(^| )main *\\(.*" all)
(string-append all "{\n exit (77);//")))))))) (string-append all "{\n exit (77);//")))))))
(else (else #~())))))
(list
#:configure-flags #~(list "--enable-install-gpg-error-config")))))
(native-inputs (list gettext-minimal)) (native-inputs (list gettext-minimal))
(home-page "https://gnupg.org") (home-page "https://gnupg.org")
(synopsis "Library of error values for GnuPG components") (synopsis "Library of error values for GnuPG components")