aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2018-05-10 01:51:08 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2018-05-10 02:12:03 +0200
commitc6ee92c41bfc0bc3b5634651bfa62bf35f2f11b5 (patch)
tree91a62b662aafaa6aa58ac60252ff8dad03a449ce
parent9e8f0ff2a91c97a241284ba064dc3d0462b5005b (diff)
downloadgnu-guix-c6ee92c41bfc0bc3b5634651bfa62bf35f2f11b5.tar
gnu-guix-c6ee92c41bfc0bc3b5634651bfa62bf35f2f11b5.tar.gz
gnu: Add android-googletest.
* gnu/packages/android.scm (android-googletest): New variable. * guix/build-system/android-ndk.scm (android-ndk-build): Use it.
-rw-r--r--gnu/packages/android.scm17
-rw-r--r--guix/build-system/android-ndk.scm2
2 files changed, 18 insertions, 1 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 4c47505375..eda243314a 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -77,6 +77,23 @@
use their packages mostly unmodified in our Android NDK build system.")
(license license:asl2.0)))
+(define-public android-googletest
+ (package (inherit googletest)
+ (name "android-googletest")
+ (arguments
+ `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-host-libraries
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib")))
+ (symlink "libgtest.so"
+ (string-append lib "/libgtest_host.so"))
+ (symlink "libgmock.so"
+ (string-append lib "/libgmock_host.so"))
+ #t))))))))
+
;; The Makefiles that we add are largely based on the Debian
;; packages. They are licensed under GPL-2 and have copyright:
;; 2012, Stefan Handschuh <handschuh.stefan@googlemail.com>
diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm
index 891fc6e042..029f654bb3 100644
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@ -113,7 +113,7 @@
;; Keep the standard inputs of 'gnu-build-system'
,@(standard-packages)))
(build-inputs `(("android-make-stub" ,(module-ref (resolve-interface '(gnu packages android)) 'android-make-stub))
- ("googletest" ,(module-ref (resolve-interface '(gnu packages check)) 'googletest))
+ ("android-googletest" ,(module-ref (resolve-interface '(gnu packages android)) 'android-googletest))
,@native-inputs))
(outputs outputs)
(build android-ndk-build)