guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: launchmon: Fix build with GCC 7.


From: guix-commits
Subject: branch master updated: gnu: launchmon: Fix build with GCC 7.
Date: Fri, 13 Mar 2020 20:41:01 -0400

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 989d564  gnu: launchmon: Fix build with GCC 7.
989d564 is described below

commit 989d564f4434c6e43df7ccb0d1701e89e243e404
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Mar 13 20:18:53 2020 +0100

    gnu: launchmon: Fix build with GCC 7.
    
    * gnu/packages/admin.scm (launchmon)[source](modules, snippet): New fields.
---
 gnu/packages/admin.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 0f27e63..5ec3486 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]