ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: android-libutils: Fix build failure.

Browse source 
* gnu/packages/android.scm (android-libutils)[arguments]: Add phase
'augment-CPLUS_INCLUDE_PATH'.
[native-inputs]: Distinguish GCC-5.
This commit is contained in:
Marius Bakke 2020-05-07 16:05:57 +02:00
parent 2ca603f113
commit 23a59b180b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/android.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Stefan Handschuh <handschuh.stefan@googlemail.com> ;;; Copyright © 2012 Stefan Handschuh <handschuh.stefan@googlemail.com>
;;; Copyright © 2015 Kai-Chung Yan <seamlikok@gmail.com> ;;; Copyright © 2015 Kai-Chung Yan <seamlikok@gmail.com>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -611,9 +611,20 @@ (define-public android-libutils
#:make-flags '("CXXFLAGS=-std=gnu++11 -Wno-error") #:make-flags '("CXXFLAGS=-std=gnu++11 -Wno-error")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent it from
;; shadowing the version of GCC provided in native-inputs.
(let ((gcc (assoc-ref inputs "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
":"))
#t)))
(add-after 'unpack 'enter-source (add-after 'unpack 'enter-source
(lambda _ (chdir "libutils") #t)) (lambda _ (chdir "libutils") #t))
(add-after 'install 'install-headers (add-after 'install 'install-headers
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(copy-recursively "../include/utils" (string-append (assoc-ref outputs "out") "/include/utils"))))))) (copy-recursively "../include/utils" (string-append (assoc-ref outputs "out") "/include/utils")))))))
@ -623,7 +634,7 @@ (define-public android-libutils
(native-inputs (native-inputs
`(("android-bionic-uapi" ,android-bionic-uapi) `(("android-bionic-uapi" ,android-bionic-uapi)
("android-liblog" ,android-liblog) ("android-liblog" ,android-liblog)
("gcc" ,gcc-5))) ; XXX: fails to build with GCC 7 ("gcc@5" ,gcc-5))) ; XXX: fails to build with GCC 7
(home-page "https://developer.android.com/") (home-page "https://developer.android.com/")
(synopsis "Android utility library") (synopsis "Android utility library")
(description "@code{android-libutils} provides utilities for Android NDK developers.") (description "@code{android-libutils} provides utilities for Android NDK developers.")