~ruther/guix-local

16111ad11c9a0345bb4c05f49a8e40413da1ea93 — Ludovic Courtès 5 years ago 3504e39
gnu: gcc: Phases no longer return a Boolean.

* gnu/packages/gcc.scm (gcc-4.7, gcc-4.9)
(make-libiberty, custom-gcc, libgccjit)
(make-libstdc++-doc, isl, gnu-c-manual): Remove trailing #t from
phases.
1 files changed, 11 insertions(+), 22 deletions(-)

M gnu/packages/gcc.scm
M gnu/packages/gcc.scm => gnu/packages/gcc.scm +11 -22
@@ 320,8 320,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                  ;; but there's nothing useful to look for here.)
                  (substitute* "gcc/config.in"
                    (("PREFIX_INCLUDE_DIR")
                     "PREFIX_INCLUDE_DIR_isnt_necessary_here"))
                  #t)))
                     "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))

            (add-after 'configure 'post-configure
              (lambda _


@@ 329,8 328,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
                (substitute* "Makefile"
                  (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
                   "TOPLEVEL_CONFIGURE_ARGUMENTS=\n"))
                #t)))))
                   "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))

       (native-search-paths
        ;; Use the language-specific variables rather than 'CPATH' because they


@@ 446,8 444,7 @@ Go.  It also includes runtime support libraries for these languages.")
                                          ":"))
                     (format #t
                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
                             (getenv "CPLUS_INCLUDE_PATH"))
                     #t))))))))))
                             (getenv "CPLUS_INCLUDE_PATH"))))))))))))

(define-public gcc-5
  ;; Note: GCC >= 5 ships with .info files but 'make install' fails to install


@@ 647,16 644,14 @@ using compilers other than GCC."
       (modify-phases %standard-phases
         (add-before 'configure 'chdir
           (lambda _
             (chdir "libiberty")
             #t))
             (chdir "libiberty")))
         (replace 'install
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out     (assoc-ref outputs "out"))
                    (lib     (string-append out "/lib/"))
                    (include (string-append out "/include/")))
               (install-file "libiberty.a" lib)
               (install-file "../include/libiberty.h" include))
             #t)))))
               (install-file "../include/libiberty.h" include)))))))
    (inputs '())
    (outputs '("out"))
    (native-inputs '())


@@ 698,8 693,7 @@ as the 'native-search-paths' field."
             (lambda* (#:key outputs #:allow-other-keys)
               (for-each delete-file
                         (find-files (string-append (assoc-ref outputs "out") "/bin")
                                     ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))
               #t))))))))
                                     ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))))

(define %generic-search-paths
  ;; This is the language-neutral search path for GCC.  Entries in $CPATH are


@@ 753,8 747,7 @@ as the 'native-search-paths' field."
             (lambda* (#:key outputs #:allow-other-keys)
               (for-each delete-file
                         (find-files (string-append (assoc-ref outputs "out") "/bin")
                                     ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))
               #t))))))
                                     ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))
    (synopsis "GCC library generating machine code on-the-fly at runtime")
    (description
     "This package is part of the GNU Compiler Collection and provides an


@@ 887,8 880,7 @@ provides the GNU compiler for the Go programming language."))
       #:phases (modify-phases %standard-phases
                  (add-before 'configure 'chdir
                              (lambda _
                                (chdir "libstdc++-v3")
                                #t))
                                (chdir "libstdc++-v3")))
                  (add-before 'configure 'set-xsl-directory
                              (lambda* (#:key inputs #:allow-other-keys)
                                (let ((docbook (assoc-ref inputs "docbook-xsl")))


@@ 897,8 889,7 @@ provides the GNU compiler for the Go programming language."))
                                    (("@XSL_STYLE_DIR@")
                                     (string-append
                                      docbook "/xml/xsl/"
                                      (strip-store-file-name docbook))))
                                  #t)))
                                      (strip-store-file-name docbook)))))))
                  (replace 'build
                           (lambda _
                             ;; XXX: There's also a 'doc-info' target, but it


@@ 955,8 946,7 @@ provides the GNU compiler for the Go programming language."))
                        ;; libtool looks for it in the usual locations.
                        (substitute* (string-append out "/lib/libisl.la")
                          (("^old_library=.*")
                           "old_library=''\n"))
                        #t))))))
                           "old_library=''\n"))))))))
    (inputs `(("gmp" ,gmp)))
    (home-page "http://isl.gforge.inria.fr/")
    (synopsis


@@ 1082,8 1072,7 @@ effective code.")
                                           (copy-file file
                                                      (string-append html "/"
                                                                     file)))
                                         (find-files "." "\\.html$"))
                               #t))))))
                                         (find-files "." "\\.html$"))))))))
    (synopsis "Reference manual for the C programming language")
    (description
     "This is a reference manual for the C programming language, as