[Top][All Lists]

[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 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
        (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 _
+             ;; relies on ‘git --describe’ to get the version.
+             ;; Patch it to just return the real version number directly.
+             (substitute* "scripts/build-aux/"
+               (("/bin/sh") (which "sh"))
+               (("\\$GITDESC") ,version))
+             (invoke "sh" "./"))))))
     (synopsis "Belgian eID Middleware")
     (description "The Belgian eID Middleware is required to authenticate with
 online services using the Belgian electronic identity card.")

reply via email to

[Prev in Thread] Current Thread [Next in Thread]