summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-13 20:18:53 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-14 01:39:43 +0100
commit989d564f4434c6e43df7ccb0d1701e89e243e404 (patch)
tree2c2f89c424746ce6eb80d30ea99266025d49197d /gnu
parent39356057bce20f74120b6d227567a943556717cc (diff)
downloadguix-989d564f4434c6e43df7ccb0d1701e89e243e404.tar.gz
gnu: launchmon: Fix build with GCC 7.
* gnu/packages/admin.scm (launchmon)[source](modules, snippet): New fields.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/admin.scm11
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 0f27e6370b..5ec34864e2 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3170,7 +3170,16 @@ late.")
                     version "/launchmon-v" version ".tar.gz"))
               (sha256
                (base32
-                "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x"))))
+                "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Fix build failure with GCC 7 due to a conversion error.
+                  ;; Remove for versions > 1.0.2.
+                  (substitute* "launchmon/src/linux/lmon_api/lmon_coloc_spawner.cxx"
+                    ((" lmonpl = '\\\\0'")
+                     " *lmonpl = '\\0'"))
+                  #t))))
     (build-system gnu-build-system)
     (inputs
      `(("mpi" ,openmpi)