From 080093ff6a5be997ec1458a8d0e0ca300ee3fc46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Jun 2018 21:06:15 +0200 Subject: gnu: eid-mw: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 eb89c2a5ca..4619b83921 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.") -- cgit v1.2.3