From 51d4c79dc28c70cde61348eb52775f45125a2ee7 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 31 Jul 2019 14:54:59 +0200
Subject: [PATCH] gnu: Remove workarounds for <https://bugs.gnu.org/36721>.

These are no longer needed since 941ef1a1e54893ca917ebbaa4b8cc14b5ce9b75c.

* gnu/packages/compression.scm (innoextract)[arguments]: Remove
"-DBoost_NO_BOOST_CMAKE=ON" from <#:configure-flags>.
* gnu/packages/game-development.scm (openmw)[arguments]: Likewise.
* gnu/packages/games.scm (supertux, colobot, leela-zero)[arguments]: Likewise.
* gnu/packages/graphics.scm (openimageio)[arguments]: Likewise.
* gnu/packages/ibus.scm (librime)[arguments]: Likewise.
---
 gnu/packages/compression.scm      | 3 ---
 gnu/packages/game-development.scm | 3 +--
 gnu/packages/games.scm            | 8 +-------
 gnu/packages/graphics.scm         | 5 +----
 gnu/packages/ibus.scm             | 4 +---
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index da9e646f5f..774abad5c9 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1822,9 +1822,6 @@ (define-public innoextract
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f
-      ;; XXX: Work around a problem with the CMake support in Boost 1.70:
-      ;; <https://github.com/dscharrer/innoextract/issues/88>.
-      #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON")
       #:phases (modify-phases %standard-phases
                  (add-before 'configure 'glibc-is-already-a-system-library
                    (lambda _
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 5a4b81a988..7eac935a69 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1116,8 +1116,7 @@ (define-public openmw
     (arguments
      `(#:tests? #f                      ; No test target
        #:configure-flags
-       (list "-DDESIRED_QT_VERSION=5"
-             "-DBoost_NO_BOOST_CMAKE=ON"))) ;work around <https://bugs.gnu.org/36721>
+       (list "-DDESIRED_QT_VERSION=5")))
     (native-inputs
      `(("boost" ,boost)
        ("doxygen" ,doxygen)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4e7fb2e428..66b642ebd2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3516,8 +3516,6 @@ (define-public supertux
    (arguments
     '(#:tests? #f
       #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin"
-                          ;; XXX: Work around <https://bugs.gnu.org/36721>.
-                          "-DBoost_NO_BOOST_CMAKE=ON"
                           "-DUSE_SYSTEM_PHYSFS=ON")
       #:phases
       (modify-phases %standard-phases
@@ -5390,8 +5388,6 @@ (define-public colobot
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ;no test
-       ;; XXX: Work around <https://bugs.gnu.org/36721>.
-       #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'make-git-checkout-writable
@@ -7616,9 +7612,7 @@ (define-public leela-zero
       ("qtbase" ,qtbase)
       ("zlib" ,zlib)))
    (arguments
-    '(#:configure-flags '("-DUSE_BLAS=YES"
-                          ;; XXX: Work around <https://bugs.gnu.org/36721>.
-                          "-DBoost_NO_BOOST_CMAKE=ON")
+    '(#:configure-flags '("-DUSE_BLAS=YES")
       #:phases (modify-phases %standard-phases
                  (add-before 'configure 'fix-tests
                    (lambda* (#:key outputs #:allow-other-keys)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 66d47fdb84..f4f9228a07 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -467,10 +467,7 @@ (define-public openimageio
     ;; third party sources have to be present.  For details see
     ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL
     (arguments
-     `(#:tests? #f
-       ;; XXX: Work around a problem with Boost 1.70 and CMake 3.14.  See
-       ;; <https://bugs.gnu.org/36721> for details.
-       #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON")))
+     `(#:tests? #f))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 9291a74394..96fded0f4e 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -325,9 +325,7 @@ (define-public librime
            #t))))
     (build-system cmake-build-system)
     (arguments
-     '(;; XXX: Work around <https://bugs.gnu.org/36721>.
-       #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON")
-       #:phases
+     '(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-source
            (lambda _