nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: binutils: Update to 2.28.1. 

* gnu/packages/base.scm (binutils): Update to 2.28.1.
[replacement]: Remove field.
* gnu/packages/commencement.scm (binutils-boot0, binutils-final): Don't
use 'package/inherit'.
This commit is contained in:
Efraim Flashner 2017-10-01 21:55:09 +03:00
parent 64df08f0cf
commit 45953b1f67
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/base.scm
View File

@ -392,16 +392,15 @@ change. GNU make offers many powerful extensions over the standard utility.")
(define-public binutils (define-public binutils
(package (package
(replacement binutils/fixed)
(name "binutils") (name "binutils")
(version "2.28") (version "2.28.1")
(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
"0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2")) "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"))
(patches (search-patches "binutils-ld-new-dtags.patch" (patches (search-patches "binutils-ld-new-dtags.patch"
"binutils-loongson-workaround.patch")))) "binutils-loongson-workaround.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -434,19 +433,6 @@ included.")
(license gpl3+) (license gpl3+)
(home-page "https://www.gnu.org/software/binutils/"))) (home-page "https://www.gnu.org/software/binutils/")))
(define binutils/fixed
(package
(inherit binutils)
;; 2.28.1 is two characters longer than 2.28, so grafting fails due to
;; mismatched lengths of filenames, so we have to force it to the same length.
(version "2281")
(source
(origin (inherit (package-source binutils))
(uri "mirror://gnu/binutils/binutils-2.28.1.tar.bz2")
(sha256
(base32
"1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"))))))
(define* (make-ld-wrapper name #:key (define* (make-ld-wrapper name #:key
(target (const #f)) (target (const #f))
binutils binutils

4
gnu/packages/commencement.scm
View File

@ -140,7 +140,7 @@
(define binutils-boot0 (define binutils-boot0
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package/inherit binutils (package (inherit binutils)
(name "binutils-cross-boot0") (name "binutils-cross-boot0")
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -681,7 +681,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define binutils-final (define binutils-final
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package/inherit binutils (package (inherit binutils)
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
#:implicit-inputs? #f #:implicit-inputs? #f