From e052c7e1d5deaaffa0f32fa801508b6316167690 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Oct 2016 22:06:24 +0200 Subject: gnu: gcc@4.8: Use an older Texinfo. * gnu/packages/gcc.scm (gcc-4.8)[native-inputs]: New field. (gcc-4.9): Inherit from GCC-4.7. --- gnu/packages/gcc.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index b1c9b21d82..b26e93e886 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -40,6 +40,7 @@ (define-module (gnu packages gcc) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix utils) + #:use-module (srfi srfi-1) #:use-module (ice-9 regex)) (define %gcc-infrastructure @@ -328,10 +329,15 @@ (define-public gcc-4.8 (sha256 (base32 "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2")) - (patches (search-patches "gcc-arm-link-spec-fix.patch")))))) + (patches (search-patches "gcc-arm-link-spec-fix.patch")))) + + ;; Texinfo 6.3 fails to build the manual: + ;; ../../gcc-4.8.5/gcc/doc/gcc.texi:208: no matching `@end tex' + ;; Use an older one. + (native-inputs `(("texinfo" ,texinfo-5))))) (define-public gcc-4.9 - (package (inherit gcc-4.8) + (package (inherit gcc-4.7) (version "4.9.4") (source (origin (method url-fetch) -- cgit v1.2.3