guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: googletest: Update to 1.8.0.


From: Ben Woodcroft
Subject: 01/01: gnu: googletest: Update to 1.8.0.
Date: Fri, 3 Mar 2017 03:00:33 -0500 (EST)

benwoodcroft pushed a commit to branch master
in repository guix.

commit 84e36a562bd16dcc2dc1e18abf2a96a3b0d968af
Author: Ben Woodcroft <address@hidden>
Date:   Fri Mar 3 17:55:16 2017 +1000

    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.
---
 gnu/packages/check.scm | 44 ++++----------------------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 9ad03cd..372f1c4 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



reply via email to

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