diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 21:55:09 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 22:16:24 +0300 |
| commit | 45953b1f67310110ffcfb3dc0aa87c7b6f1f76cf (patch) | |
| tree | a9bdcaa037508a16e28cb8b556152ed0f52f222f | |
| parent | 64df08f0cfac8f7a329002afa3461fd62a4b229c (diff) | |
| download | guix-45953b1f67310110ffcfb3dc0aa87c7b6f1f76cf.tar guix-45953b1f67310110ffcfb3dc0aa87c7b6f1f76cf.tar.gz | |
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'.
| -rw-r--r-- | gnu/packages/base.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/commencement.scm | 4 |
2 files changed, 4 insertions, 18 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e0f2844bce..20f5ab7de6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -392,16 +392,15 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package - (replacement binutils/fixed) (name "binutils") - (version "2.28") + (version "2.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2")) + "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939")) (patches (search-patches "binutils-ld-new-dtags.patch" "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) @@ -434,19 +433,6 @@ included.") (license gpl3+) (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 (target (const #f)) binutils diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 23939157ec..68faf36d52 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -140,7 +140,7 @@ (define binutils-boot0 (package-with-bootstrap-guile - (package/inherit binutils + (package (inherit binutils) (name "binutils-cross-boot0") (arguments `(#:guile ,%bootstrap-guile @@ -681,7 +681,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define binutils-final (package-with-bootstrap-guile - (package/inherit binutils + (package (inherit binutils) (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f |