me
/
guix
Archived
1
0
Fork 0
Code

Revert "gnu: gnupg: Update to 2.1.19." 

This reverts commit 07302d1ab4.

GnuPG 2.1.19 fails to build on armhf-linux and i686-linux:

<https://bugs.gnupg.org/gnupg/issue2988>
master
Leo Famulari 2017-03-06 17:10:33 -05:00
parent e20784e65e
commit 14807141e5
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/gnupg.scm
View File

@ -217,14 +217,14 @@ compatible to GNU Pth.")
(define-public gnupg (define-public gnupg
(package (package
(name "gnupg") (name "gnupg")
(version "2.1.19") (version "2.1.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26")))) "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -243,11 +243,7 @@ compatible to GNU Pth.")
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("--enable-gpg2-is-gpg" `(#:configure-flags '("--enable-gpg2-is-gpg")
;; Otherwise, the test suite looks for the `gpg`
;; executable in its installation directory in
;; /gnu/store before it has been installed.
"--enable-gnupg-builddir-envvar")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths
@ -263,27 +259,11 @@ compatible to GNU Pth.")
(("/usr/bin/env gpgscm") (("/usr/bin/env gpgscm")
(string-append (getcwd) "/tests/gpgscm/gpgscm"))) (string-append (getcwd) "/tests/gpgscm/gpgscm")))
#t)) #t))
(add-before 'build 'patch-test-paths ;; If this variable is undefined, /bin/pwd is invoked.
(lambda* (#:key inputs #:allow-other-keys) (add-before 'check 'set-gnupg-home
(let* ((coreutils (assoc-ref inputs "coreutils")) (lambda _
(cat (string-append coreutils "/bin/cat")) (setenv "GNUPGHOME" (getcwd))
(pwd (string-append coreutils "/bin/pwd")) #t)))))
(true (string-append coreutils "/bin/true"))
(false (string-append coreutils "/bin/false")))
(substitute* '("tests/inittests"
"tests/pkits/inittests"
"tests/Makefile"
"tests/pkits/common.sh"
"tests/pkits/Makefile"
)
(("/bin/pwd") pwd))
(substitute* "common/t-exectool.c"
(("/bin/cat") cat))
(substitute* "common/t-exectool.c"
(("/bin/true") true))
(substitute* "common/t-exectool.c"
(("/bin/false") false))
#t))))))
(home-page "https://gnupg.org/") (home-page "https://gnupg.org/")
(synopsis "GNU Privacy Guard") (synopsis "GNU Privacy Guard")
(description (description