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

gnu: qt@4: Hide the default GCC from CPLUS_INCLUDE_PATH.

Browse source 
* gnu/packages/qt.scm (qt-4)[native-inputs]: Distinguish GCC-5.
[arguments]: Add phase to hide the default GCC from CPLUS_INCLUDE_PATH to fix
conflicting headers.
This commit is contained in:
Marius Bakke 2020-04-21 19:07:09 +02:00
parent 3994b55cd6
commit e5109374d8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/qt.scm
View file

@ -223,7 +223,7 @@ (define-public qt-4
`(;; XXX: The JavaScriptCore engine does not build with the C++11 standard. `(;; XXX: The JavaScriptCore engine does not build with the C++11 standard.
;; We could build it with -std=gnu++98, but then we'll get in trouble with ;; We could build it with -std=gnu++98, but then we'll get in trouble with
;; ICU later. Just keep using GCC 5 for now. ;; ICU later. Just keep using GCC 5 for now.
("gcc" ,gcc-5) ("gcc@5" ,gcc-5)
("bison" ,bison) ("bison" ,bison)
("flex" ,flex) ("flex" ,flex)
("gperf" ,gperf) ("gperf" ,gperf)
@ -240,6 +240,17 @@ (define-public qt-4
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-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)))
(replace (replace
'configure 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)