gnu: innoextract: Fix build failure with recent Boost and CMake.
authorMarius Bakke <mbakke@fastmail.com>
Sat, 14 Mar 2020 00:24:41 +0000 (01:24 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Sat, 14 Mar 2020 11:02:53 +0000 (12:02 +0100)
* 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

index c3b5632..0dec289 100644 (file)
@@ -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)))