diff options
Diffstat (limited to 'gnu/packages/xfig.scm')
| -rw-r--r-- | gnu/packages/xfig.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 9004c79e22..1d4d17527c 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2022 Ivan Vilata i Balaguer <ivan@selidor.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,7 +86,10 @@ selected in various ways. For text, 35 fonts are available.") version ".tar.gz")) (sha256 (base32 - "0i3p7qmg2w8qrad3pn42b0miwarql7yy0gpd49b1bpal6bqsiicf")))) + "0i3p7qmg2w8qrad3pn42b0miwarql7yy0gpd49b1bpal6bqsiicf")) + (patches + (search-patches + "transfig-gcc10-fno-common.patch")))) ; fix GCC10 build (build-system gnu-build-system) (native-inputs (list imake makedepend)) @@ -123,6 +127,7 @@ selected in various ways. For text, 35 fonts are available.") (invoke "xmkmf" "-a") (substitute* '("Makefile" "fig2dev/Makefile" + "fig2dev/dev/Makefile" "transfig/Makefile") ;; These imake variables somehow remain undefined (("DefaultGcc2[[:graph:]]*Opt") "-O2") @@ -131,7 +136,12 @@ selected in various ways. For text, 35 fonts are available.") (("(MANPATH = )[[:graph:]]*" _ front) (string-append front out "/share/man")) (("(CONFDIR = )([[:graph:]]*)" _ front default) - (string-append front out default))) + (string-append front out default)) + ;; The "l" option was silently ignored until binutils 2.36, + ;; where it got a different purpose. So remove it to avoid + ;; "ar: libdeps specified more than once". + (("((AR|MODAR) = ar )clq" _ front) + (string-append front "cq"))) #t))) (add-after 'install 'install/doc (lambda _ |