aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorBen Woodcroft <donttrustben@gmail.com>2017-03-03 17:55:16 +1000
committerBen Woodcroft <donttrustben@gmail.com>2017-03-03 17:57:23 +1000
commit84e36a562bd16dcc2dc1e18abf2a96a3b0d968af (patch)
tree8de08a429b41d9752b054d997739031654552218 /gnu/packages
parent488a373451595c82e9be21da8456ba2cfe2ef4b1 (diff)
downloadpatches-84e36a562bd16dcc2dc1e18abf2a96a3b0d968af.tar
patches-84e36a562bd16dcc2dc1e18abf2a96a3b0d968af.tar.gz
gnu: googletest: Update to 1.8.0.
* gnu/packages/check.scm (googletest): Update to 1.8.0. [build-system]: Use cmake-build-system. [arguments]: Remove field. [native-inputs]: Remove autoconf, automake, libtool.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/check.scm44
1 files changed, 4 insertions, 40 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 9ad03cd558..372f1c4fea 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -201,7 +201,7 @@ normally do not detect. The goal is to detect only real errors in the code
(define-public googletest
(package
(name "googletest")
- (version "1.7.0")
+ (version "1.8.0")
(source
(origin
(method url-fetch)
@@ -210,46 +210,10 @@ normally do not detect. The goal is to detect only real errors in the code
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1k0nf1l9cb3prdmsvaajl5i31bx86c1mw0d5jgzykz7rzm36afpp"))))
- (build-system gnu-build-system)
+ "1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq"))))
+ (build-system cmake-build-system)
(native-inputs
- `(("python-2" ,python-2)
- ("autoconf" ,autoconf)
- ("automake" ,automake)
- ("libtool" ,libtool)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'autoconf
- (lambda _
- (zero? (system* "autoreconf" "-vfi"))))
- (add-before 'autoconf 'generate-headers
- (lambda _
- (begin
- (delete-file "include/gtest/gtest-param-test.h")
- (system* "python2" "scripts/pump.py"
- "include/gtest/gtest-param-test.h.pump")
- (delete-file "include/gtest/internal/gtest-tuple.h")
- (system* "python2" "scripts/pump.py"
- "include/gtest//internal/gtest-tuple.h.pump")
- (delete-file
- "include/gtest/internal/gtest-param-util-generated.h")
- (system*
- "python2" "scripts/pump.py"
- "include/gtest/internal/gtest-param-util-generated.h.pump")
- (delete-file "include/gtest/internal/gtest-type-util.h")
- (system* "python2" "scripts/pump.py"
- "include/gtest/internal/gtest-type-util.h.pump"))))
- (replace 'install
- (lambda _
- (let ((out (assoc-ref %outputs "out")))
- (begin
- (install-file "lib/.libs/libgtest_main.a"
- (string-append out "/lib"))
- (install-file "lib/.libs/libgtest.a"
- (string-append out "/lib"))
- (copy-recursively "include"
- (string-append out "/include")))))))))
+ `(("python-2" ,python-2)))
(home-page "https://github.com/google/googletest/")
(synopsis "Test discovery and XUnit test framework")
(description "Google Test features an XUnit test framework, automated test