[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: gnu: Add android-googletest.
From: |
Danny Milosavljevic |
Subject: |
03/08: gnu: Add android-googletest. |
Date: |
Wed, 9 May 2018 20:41:45 -0400 (EDT) |
dannym pushed a commit to branch master
in repository guix.
commit c6ee92c41bfc0bc3b5634651bfa62bf35f2f11b5
Author: Danny Milosavljevic <address@hidden>
Date: Thu May 10 01:51:08 2018 +0200
gnu: Add android-googletest.
* gnu/packages/android.scm (android-googletest): New variable.
* guix/build-system/android-ndk.scm (android-ndk-build): Use it.
---
gnu/packages/android.scm | 17 +++++++++++++++++
guix/build-system/android-ndk.scm | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 4c47505..eda2433 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 <address@hidden>
diff --git a/guix/build-system/android-ndk.scm
b/guix/build-system/android-ndk.scm
index 891fc6e..029f654 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)
- branch master updated (e55e6d3 -> b913d1e), Danny Milosavljevic, 2018/05/09
- 02/08: gnu: android-f2fs-utils: Don't disable tests., Danny Milosavljevic, 2018/05/09
- 04/08: gnu: android-make-stub: Update to 0.5.4., Danny Milosavljevic, 2018/05/09
- 05/08: gnu: android-make-stub: Update to 0.5.5., Danny Milosavljevic, 2018/05/09
- 07/08: gnu: fastboot: Simplify package., Danny Milosavljevic, 2018/05/09
- 01/08: gnu: android-ext4-utils: Don't disable tests., Danny Milosavljevic, 2018/05/09
- 03/08: gnu: Add android-googletest.,
Danny Milosavljevic <=
- 06/08: gnu: android-libutils: Add android-liblog., Danny Milosavljevic, 2018/05/09
- 08/08: gnu: fastboot: Enable tests., Danny Milosavljevic, 2018/05/09