From 75ca2cdaff06b125b39a4f71499efcb73aa94b6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 01:24:41 +0100 Subject: gnu: innoextract: Fix build failure with recent Boost and CMake. * gnu/packages/compression.scm (innoextract)[arguments]: Add #:configure-flags to prevent usage of Boost's CMake scripts. While at it, remove the obsolete #:phases. --- gnu/packages/compression.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c3b5632cba..0dec28940b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1781,17 +1781,7 @@ single-member files which can't be decompressed in parallel.") (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))) -- cgit v1.2.3