From 1a044e3936ac4c1ba1575fe791bf59577b039cf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 00:21:41 +0200 Subject: gnu: freehdl: Fix build failure. Fixes . Reported by tsmish . * 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 5674c68645..172f8481eb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 John Soo ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Marius Bakke ;;; ;;; 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") -- cgit v1.2.3