diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-07 16:05:57 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-07 16:05:57 +0200 |
| commit | 23a59b180b28b9fa22120c2b8305b9324442b94d (patch) | |
| tree | 3b5e78b7957331fa388e647b50b1707a15166d81 /gnu | |
| parent | 2ca603f113a24f89284ade0771defadfbfed9972 (diff) | |
| download | patches-23a59b180b28b9fa22120c2b8305b9324442b94d.tar patches-23a59b180b28b9fa22120c2b8305b9324442b94d.tar.gz | |
gnu: android-libutils: Fix build failure.
* gnu/packages/android.scm (android-libutils)[arguments]: Add phase
'augment-CPLUS_INCLUDE_PATH'.
[native-inputs]: Distinguish GCC-5.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/android.scm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 68bcb72e69..9ee7d28687 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 <handschuh.stefan@googlemail.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 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -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.") |