[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/18: gnu: eid-mw: Fix build.
From: |
Tobias Geerinckx-Rice |
Subject: |
14/18: gnu: eid-mw: Fix build. |
Date: |
Fri, 22 Jun 2018 17:22:21 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 080093ff6a5be997ec1458a8d0e0ca300ee3fc46
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Jun 22 21:06:15 2018 +0200
gnu: eid-mw: Fix build.
* gnu/packages/security-token.scm (eid-mw)[arguments]: Move the
‘bootstrap’ phase to after ‘unpack’. Modify it to run without errors,
and call upstream's bootstrap.sh script instead of our own copy.
---
gnu/packages/security-token.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index eb89c2a..4619b83 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -121,9 +121,14 @@ readers and is needed to communicate with such devices
through the
(arguments
`(#:phases
(modify-phases %standard-phases
- ;; The github tarball doesn't contain a configure script.
- (add-before 'configure 'autoreconf
- (lambda _ (zero? (system* "autoreconf" "-i")))))))
+ (add-after 'unpack 'bootstrap
+ (lambda _
+ ;; configure.ac relies on ‘git --describe’ to get the version.
+ ;; Patch it to just return the real version number directly.
+ (substitute* "scripts/build-aux/genver.sh"
+ (("/bin/sh") (which "sh"))
+ (("\\$GITDESC") ,version))
+ (invoke "sh" "./bootstrap.sh"))))))
(synopsis "Belgian eID Middleware")
(description "The Belgian eID Middleware is required to authenticate with
online services using the Belgian electronic identity card.")
- 02/18: gnu: git-crypt: Return #t from all phases., (continued)
- 02/18: gnu: git-crypt: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 03/18: gnu: qemu: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/22
- 05/18: gnu: guile-ssh: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 06/18: gnu: corkscrew: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 08/18: gnu: corkscrew: Clean up dead code., Tobias Geerinckx-Rice, 2018/06/22
- 07/18: gnu: corkscrew: Deduplicate documentation directories., Tobias Geerinckx-Rice, 2018/06/22
- 09/18: gnu: busybox: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 04/18: gnu: libtocc: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 10/18: gnu: libgit2: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 13/18: gnu: eid-mw: Don't use unstable tarball., Tobias Geerinckx-Rice, 2018/06/22
- 14/18: gnu: eid-mw: Fix build.,
Tobias Geerinckx-Rice <=
- 11/18: gnu: Use HTTPS for drobilla.net URIs., Tobias Geerinckx-Rice, 2018/06/22
- 15/18: gnu: eid-mw: Update to 4.4.3., Tobias Geerinckx-Rice, 2018/06/22
- 18/18: gnu: perl-cgi-simple: Update to 1.15., Tobias Geerinckx-Rice, 2018/06/22
- 12/18: gnu: Use more HTTPS., Tobias Geerinckx-Rice, 2018/06/22
- 17/18: gnu: perl-catalyst-runtime: Remove left-over input., Tobias Geerinckx-Rice, 2018/06/22
- 16/18: gnu: workrave: Edit description., Tobias Geerinckx-Rice, 2018/06/22