mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: innoextract: Fix build failure with recent Boost and CMake.

Browse source 
* gnu/packages/compression.scm (innoextract)[arguments]: Add #:configure-flags
to prevent usage of Boost's CMake scripts.  While at it, remove the obsolete
 #:phases.
This commit is contained in:
Marius Bakke 2020-03-14 01:24:41 +01:00
parent ef4c5a413e
commit 75ca2cdaff
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/compression.scm
View file

@ -1781,17 +1781,7 @@ (define-public innoextract
(build-system cmake-build-system)
(arguments
`(#:tests? #f
#:phases (modify-phases %standard-phases
(add-before 'configure 'glibc-is-already-a-system-library
(lambda _
;; Prevent the build system from passing the glibc
;; header files to GCC as "system headers", because
;; it conflicts with the system headers already known
;; to GCC, causing #include_next failures.
(substitute* "CMakeLists.txt"
(("include_directories\\(SYSTEM \\$\\{iconv")
"include_directories(${iconv"))
#t)))))
#:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON")))
(inputs `(("boost" ,boost)
("libiconv" ,libiconv)
("xz" ,xz)))