From db41eabd47e676b3a08ff87ceea20e0cb9f98427 Mon Sep 17 00:00:00 2001 From: Ivan Vilata i Balaguer Date: Mon, 7 Mar 2022 00:47:07 +0100 Subject: gnu: transfig: Avoid "ar" option incompatibility with binutils 2.36. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * 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 --- gnu/packages/xfig.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 9004c79e22..ad2f701ff1 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2022 Ivan Vilata i Balaguer ;;; ;;; This file is part of GNU Guix. ;;; @@ -123,6 +124,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 +133,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 _ -- cgit v1.2.3