~ruther/guix-local

c8ebc82187d83e845a201bbe45d837c97f9c64b1 — Ludovic Courtès 12 years ago 3a4ebc1
gnu: gcc: Add Texinfo to the native inputs.

* gnu/packages/gcc.scm (gcc-4.7): Add `native-inputs' field.
  (gcc-4.8): Remove outdated comment.
* gnu/packages/base.scm (gcc-boot0): Add `native-inputs' field.
2 files changed, 10 insertions(+), 2 deletions(-)

M gnu/packages/base.scm
M gnu/packages/gcc.scm
M gnu/packages/base.scm => gnu/packages/base.scm +5 -1
@@ 756,7 756,11 @@ identifier SYSTEM."
               ;; Call it differently so that the builder can check whether
               ;; the "libc" input is #f.
               ("libc-native" ,@(assoc-ref %boot0-inputs "libc"))
               ,@(alist-delete "libc" %boot0-inputs))))))
               ,@(alist-delete "libc" %boot0-inputs)))

     ;; No need for Texinfo at this stage.
     (native-inputs (alist-delete "texinfo"
                                  (package-native-inputs gcc-4.7))))))

(define linux-libre-headers-boot0
  (package-with-bootstrap-guile

M gnu/packages/gcc.scm => gnu/packages/gcc.scm +5 -1
@@ 23,6 23,7 @@
  #:use-module (gnu packages bootstrap)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages texinfo)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)


@@ 104,6 105,10 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                ("cloog" ,cloog)
                ("libelf" ,libelf)
                ("zlib" ,zlib)))

      ;; GCC is one of the few packages that doesn't ship .info files.
      (native-inputs `(("texinfo" ,texinfo)))

      (arguments
       `(#:out-of-source? #t
         #:strip-binaries? ,stripped?


@@ 199,7 204,6 @@ used in the GNU system including the GNU/Linux variant.")
      (home-page "http://gcc.gnu.org/"))))

(define-public gcc-4.8
  ;; FIXME: Move to gcc.scm when Binutils is updated.
  (package (inherit gcc-4.7)
    (version "4.8.0")
    (source (origin