ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 04:59:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: adb: Fix build.

Browse source 
* gnu/packages/android.scm (adb)[arguments]: Use gexp for 'make-flags".
This commit is contained in:
Guillaume Le Vaillant 2021-08-31 15:06:36 +02:00
parent 8948bc7e44
commit 2ac1978a9f
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/android.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Sergey Trofimov <sarg@sarg.org.ru> ;;; Copyright © 2020 Sergey Trofimov <sarg@sarg.org.ru>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,6 +31,7 @@
(define-module (gnu packages android) (define-module (gnu packages android)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system android-ndk) #:use-module (guix build-system android-ndk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -360,10 +362,10 @@ (define-public adb
(arguments (arguments
`(#:tests? #f ; Test failure: sysdeps_poll.fd_count `(#:tests? #f ; Test failure: sysdeps_poll.fd_count
#:make-flags #:make-flags
(list "CFLAGS=-Wno-error" ,#~(list "CFLAGS=-Wno-error"
"CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ." "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ."
(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib " (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib "
"-Wl,-rpath=" (assoc-ref %build-inputs "openssl") "/lib -L .")) "-Wl,-rpath=" #$openssl "/lib -L ."))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-source (add-after 'unpack 'enter-source