[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: alsa-modular-synth: Hide default GCC.
From: |
guix-commits |
Subject: |
02/02: gnu: alsa-modular-synth: Hide default GCC. |
Date: |
Sat, 13 Jun 2020 17:50:10 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit ea7882b2e397633eccf2ec7205404bec30f74312
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Jun 13 23:48:41 2020 +0200
gnu: alsa-modular-synth: Hide default GCC.
* gnu/packages/audio.scm (alsa-modular-synth)[native-inputs]: Distinguish
GCC-5.
[arguments]: Add build phase "hide-default-gcc".
---
gnu/packages/audio.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 7f9720d..b2ffeff 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -185,6 +185,17 @@ implementation of Adaptive Multi Rate Narrowband and
Wideband
"CXXFLAGS=-std=gnu++11")
#:phases
(modify-phases %standard-phases
+ (add-after 'set-paths 'hide-default-gcc
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gcc (assoc-ref inputs "gcc")))
+ ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent
+ ;; conflicts with the GCC 5 input.
+ (setenv "CPLUS_INCLUDE_PATH"
+ (string-join
+ (delete (string-append gcc "/include/c++")
+ (string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
+ ":"))
+ #t)))
;; Insert an extra space between linker flags.
(add-before 'configure 'add-missing-space
(lambda _
@@ -205,7 +216,7 @@ implementation of Adaptive Multi Rate Narrowband and
Wideband
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)
- ("gcc" ,gcc-5)))
+ ("gcc@5" ,gcc-5)))
(home-page "http://alsamodular.sourceforge.net/")
(synopsis "Realtime modular synthesizer and effect processor")
(description