ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: transfig: Avoid "ar" option incompatibility with binutils 2.36.

Browse source 
Fixes <https://issues.guix.gnu.org/53425>.

* gnu/packages/xfig.scm (transfig)[arguments]<#:phases>: Remove "l" option
from "ar" invocation in makefiles to avoid incompatible meaning in binutils
2.36 causing error "ar: libdeps specified more than once".

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Ivan Vilata i Balaguer 2022-03-07 00:47:07 +01:00 committed by Ludovic Courtès
parent 62fd3cf5b7
commit db41eabd47
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/xfig.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -123,6 +124,7 @@ (define-public transfig
(invoke "xmkmf" "-a") (invoke "xmkmf" "-a")
(substitute* '("Makefile" (substitute* '("Makefile"
"fig2dev/Makefile" "fig2dev/Makefile"
"fig2dev/dev/Makefile"
"transfig/Makefile") "transfig/Makefile")
;; These imake variables somehow remain undefined ;; These imake variables somehow remain undefined
(("DefaultGcc2[[:graph:]]*Opt") "-O2") (("DefaultGcc2[[:graph:]]*Opt") "-O2")
@ -131,7 +133,12 @@ (define-public transfig
(("(MANPATH = )[[:graph:]]*" _ front) (("(MANPATH = )[[:graph:]]*" _ front)
(string-append front out "/share/man")) (string-append front out "/share/man"))
(("(CONFDIR = )([[:graph:]]*)" _ front default) (("(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))) #t)))
(add-after 'install 'install/doc (add-after 'install 'install/doc
(lambda _ (lambda _