[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: adb: Fix build.
From: |
guix-commits |
Subject: |
01/04: gnu: adb: Fix build. |
Date: |
Tue, 31 Aug 2021 09:35:34 -0400 (EDT) |
glv pushed a commit to branch core-updates-frozen
in repository guix.
commit 2ac1978a9fe7632f1151da8a3510aadeeb7708ae
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Tue Aug 31 15:06:36 2021 +0200
gnu: adb: Fix build.
* gnu/packages/android.scm (adb)[arguments]: Use gexp for 'make-flags".
---
gnu/packages/android.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index f09d8e9..630a626 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Sergey Trofimov <sarg@sarg.org.ru>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,6 +31,7 @@
(define-module (gnu packages android)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system android-ndk)
#:use-module (guix build-system gnu)
@@ -360,10 +362,10 @@ various Android core host applications.")
(arguments
`(#:tests? #f ; Test failure: sysdeps_poll.fd_count
#:make-flags
- (list "CFLAGS=-Wno-error"
- "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull=
-D_Nullable= -I ."
- (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out")
"/lib "
- "-Wl,-rpath=" (assoc-ref %build-inputs "openssl")
"/lib -L ."))
+ ,#~(list "CFLAGS=-Wno-error"
+ "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull=
-D_Nullable= -I ."
+ (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib "
+ "-Wl,-rpath=" #$openssl "/lib -L ."))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-source