This is an automated email from the git hooks/post-receive script.
mbakke pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new 23a59b1 gnu: android-libutils: Fix build failure.
23a59b1 is described below
commit 23a59b180b28b9fa22120c2b8305b9324442b94d
Author: Marius Bakke <[email protected]>
AuthorDate: Thu May 7 16:05:57 2020 +0200
gnu: android-libutils: Fix build failure.
* gnu/packages/android.scm (android-libutils)[arguments]: Add phase
'augment-CPLUS_INCLUDE_PATH'.
[native-inputs]: Distinguish GCC-5.
---
gnu/packages/android.scm | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 68bcb72..9ee7d28 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Stefan Handschuh <[email protected]>
;;; Copyright © 2015 Kai-Chung Yan <[email protected]>
-;;; Copyright © 2016 Marius Bakke <[email protected]>
+;;; Copyright © 2016, 2020 Marius Bakke <[email protected]>
;;; Copyright © 2017 Julien Lepiller <[email protected]>
;;; Copyright © 2017 Hartmut Goebel <[email protected]>
;;; Copyright © 2017 Maxim Cournoyer <[email protected]>
@@ -611,9 +611,20 @@ file system.")
#:make-flags '("CXXFLAGS=-std=gnu++11 -Wno-error")
#: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
(lambda _ (chdir "libutils") #t))
-
(add-after 'install 'install-headers
(lambda* (#:key inputs outputs #:allow-other-keys)
(copy-recursively "../include/utils" (string-append (assoc-ref
outputs "out") "/include/utils")))))))
@@ -623,7 +634,7 @@ file system.")
(native-inputs
`(("android-bionic-uapi" ,android-bionic-uapi)
("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/";)
(synopsis "Android utility library")
(description "@code{android-libutils} provides utilities for Android NDK
developers.")
