guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: freehdl: Fix build failure.


From: guix-commits
Subject: branch master updated: gnu: freehdl: Fix build failure.
Date: Wed, 13 May 2020 18:21:54 -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 1a044e3  gnu: freehdl: Fix build failure.
1a044e3 is described below

commit 1a044e3936ac4c1ba1575fe791bf59577b039cf9
Author: Marius Bakke <address@hidden>
AuthorDate: Thu May 14 00:21:41 2020 +0200

    gnu: freehdl: Fix build failure.
    
    Fixes <https://bugs.gnu.org/41246>.
    Reported by  tsmish <address@hidden>.
    
    * gnu/packages/engineering.scm (freehdl)[source](patches): New field.
    [native-inputs]: Remove GCC-5.
---
 gnu/packages/engineering.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 5674c68..172f848 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2019 John Soo <address@hidden>
 ;;; Copyright © 2020 Brice Waegeneire <address@hidden>
 ;;; Copyright © 2020 Vincent Legoll <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1691,7 +1692,19 @@ parallel computing platforms.  It also supports serial 
execution.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "117dqs0d4pcgbzvr3jn5ppra7n7x2m6c161ywh6laa934pw7h2bz"))))
+                "117dqs0d4pcgbzvr3jn5ppra7n7x2m6c161ywh6laa934pw7h2bz"))
+              (patches
+               (list (origin
+                       ;; Fix build with GCC 7.  Patch taken from Arch Linux:
+                       ;; 
https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/freehdl
+                       (method url-fetch)
+                       (uri "https://git.archlinux.org/svntogit/community.git\
+/plain/trunk/build-fix.patch?h=packages/freehdl\
+&id=3bb90d64dfe6883e26083cd1fa96226d0d59175a")
+                       (file-name "freehdl-c++-namespace.patch")
+                       (sha256
+                        (base32
+                         
"09df3c70rx81rnhlhry1wpdhji274nx9jb74rfprk06l4739zm08")))))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -1767,7 +1780,6 @@ parallel computing platforms.  It also supports serial 
execution.")
        ("libtool" ,libtool)))
     (native-inputs
      `(("pkg-config-native" ,pkg-config)
-       ("gcc" ,gcc-5)
        ("libtool-native" ,libtool)))
     (home-page "http://www.freehdl.seul.org/";)
     (synopsis "VHDL simulator")



reply via email to

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