diff options
Diffstat (limited to 'gnu/packages/check.scm')
| -rw-r--r-- | gnu/packages/check.scm | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b279646402..9d3d036725 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2017 Mathieu Othacehe <[email protected]> ;;; Copyright © 2017 Kei Kebreau <[email protected]> ;;; Copyright © 2017 Nils Gillmann <[email protected]> -;;; Copyright © 2015, 2017 Ricardo Wurmus <[email protected]> +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <[email protected]> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <[email protected]> ;;; Copyright © 2017 Ludovic Courtès <[email protected]> ;;; Copyright © 2018 Fis Trivial <[email protected]> @@ -104,9 +104,11 @@ source code editors and IDEs.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + ;; XXX: The "bootstrap" phase detects the "bootstrap" + ;; script, but fails to execute it, so we bootstrap + ;; manually. + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vfi")))))) (native-inputs `(("automake" ,automake) ("autoconf" ,autoconf) @@ -185,13 +187,13 @@ supervised tests.") (incdir (string-append output "/include")) (docdir (string-append output "/share/doc/catch-" ,version))) - (begin - (for-each mkdir-p (list incdir docdir)) - (install-file (string-append source - "/single_include/catch.hpp") - incdir) - (copy-recursively (string-append source "/docs") - docdir)))))) + (for-each mkdir-p (list incdir docdir)) + (install-file (string-append source + "/single_include/catch.hpp") + incdir) + (copy-recursively (string-append source "/docs") + docdir) + #t)))) (home-page "http://catch-lib.net/") (synopsis "Automated test framework for C++ and Objective-C") (description |