mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 06:18:07 -05:00
gnu: binutils: Update to 2.34.
* gnu/packages/base.scm (binutils): Update to 2.34. [arguments]: Add #:make-flags. [properties]: New field. (binutils+documentation): New public variable. * gnu/packages/make-bootstrap.scm (%binutils-static)[arguments]: Inherit #:make-flags.
This commit is contained in:
parent
645772e4b9
commit
3e3a37b2bc
2 changed files with 31 additions and 5 deletions
|
@ -10,7 +10,7 @@
|
||||||
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
|
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
|
||||||
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
|
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
|
||||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||||
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||||
|
@ -399,14 +399,14 @@ (define-public gnu-make
|
||||||
(define-public binutils
|
(define-public binutils
|
||||||
(package
|
(package
|
||||||
(name "binutils")
|
(name "binutils")
|
||||||
(version "2.33.1")
|
(version "2.34")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/binutils/binutils-"
|
(uri (string-append "mirror://gnu/binutils/binutils-"
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"))
|
"1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"))
|
||||||
(patches (search-patches "binutils-loongson-workaround.patch"))))
|
(patches (search-patches "binutils-loongson-workaround.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|
||||||
|
@ -431,7 +431,17 @@ (define-public binutils
|
||||||
|
|
||||||
;; Make sure 'ar' and 'ranlib' produce archives in a
|
;; Make sure 'ar' and 'ranlib' produce archives in a
|
||||||
;; deterministic fashion.
|
;; deterministic fashion.
|
||||||
"--enable-deterministic-archives")))
|
"--enable-deterministic-archives")
|
||||||
|
|
||||||
|
;; XXX: binutils 2.34 was mistakenly released without generated manuals:
|
||||||
|
;; <https://sourceware.org/bugzilla/show_bug.cgi?id=25491>. To avoid a
|
||||||
|
;; circular dependency on texinfo, prevent the build system from creating
|
||||||
|
;; the manuals by calling "true" instead of "makeinfo"...
|
||||||
|
#:make-flags '("MAKEINFO=true")))
|
||||||
|
|
||||||
|
;; ...and "hide" this package so that users who install binutils get the
|
||||||
|
;; version with documentation defined below.
|
||||||
|
(properties '((hidden? . #t)))
|
||||||
|
|
||||||
(synopsis "Binary utilities: bfd gas gprof ld")
|
(synopsis "Binary utilities: bfd gas gprof ld")
|
||||||
(description
|
(description
|
||||||
|
@ -444,6 +454,18 @@ (define-public binutils
|
||||||
(license gpl3+)
|
(license gpl3+)
|
||||||
(home-page "https://www.gnu.org/software/binutils/")))
|
(home-page "https://www.gnu.org/software/binutils/")))
|
||||||
|
|
||||||
|
;; Work around a problem with binutils 2.34 whereby manuals are missing from
|
||||||
|
;; the release tarball. Remove this and the related code above when updating.
|
||||||
|
(define-public binutils+documentation
|
||||||
|
(package/inherit
|
||||||
|
binutils
|
||||||
|
(native-inputs
|
||||||
|
`(("texinfo" ,texinfo)))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments binutils)
|
||||||
|
((#:make-flags _ ''()) ''())))
|
||||||
|
(properties '())))
|
||||||
|
|
||||||
(define-public binutils-gold
|
(define-public binutils-gold
|
||||||
(package
|
(package
|
||||||
(inherit binutils)
|
(inherit binutils)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
|
@ -374,6 +374,10 @@ (define %binutils-static
|
||||||
(package-arguments binutils))
|
(package-arguments binutils))
|
||||||
((#:configure-flags flags _ ...)
|
((#:configure-flags flags _ ...)
|
||||||
flags)))
|
flags)))
|
||||||
|
#:make-flags ,(match (memq #:make-flags (package-arguments binutils))
|
||||||
|
((#:make-flags flags _ ...)
|
||||||
|
flags)
|
||||||
|
(_ ''()))
|
||||||
#:strip-flags '("--strip-all")
|
#:strip-flags '("--strip-all")
|
||||||
#:phases (modify-phases %standard-phases
|
#:phases (modify-phases %standard-phases
|
||||||
(add-before 'configure 'all-static
|
(add-before 'configure 'all-static
|
||||||
|
|
Loading…
Reference in a new issue