~ruther/guix-local

669b8639a229eee2493bc425d124340d6424d86d — Ludovic Courtès 11 years ago cc8ddcb
gnu: commencement: Remove unneeded configure flag for bootstrap gettext.

* gnu/packages/commencement.scm (gettext-boot0): Remove unneeded
  --disable-threads.
1 files changed, 26 insertions(+), 28 deletions(-)

M gnu/packages/commencement.scm
M gnu/packages/commencement.scm => gnu/packages/commencement.scm +26 -28
@@ 421,34 421,32 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"

(define gettext-boot0
  ;; A minimal gettext used during bootstrap.
  (let ((gettext-minimal (package
                           (inherit gnu-gettext)
                           (name "gettext-boot0")
                           (inputs '())           ;zero dependencies
                           (arguments
                            (substitute-keyword-arguments
                                `(#:configure-flags '("--disable-threads")
                                  #:tests? #f
                                  ,@(package-arguments gnu-gettext))
                              ((#:phases phases)
                               `(modify-phases ,phases
                                  ;; Build only the tools.
                                  (add-after 'unpack 'chdir
                                             (lambda _
                                               (chdir "gettext-tools")))

                                  ;; Some test programs require pthreads,
                                  ;; which we don't have.
                                  (add-before 'configure 'no-test-programs
                                              (lambda _
                                                (substitute* "tests/Makefile.in"
                                                  (("^PROGRAMS =.*$")
                                                   "PROGRAMS =\n"))
                                                #t))

                                  ;; Don't try to link against libexpat.
                                  (delete 'link-expat)
                                  (delete 'patch-tests))))))))
  (let ((gettext-minimal
         (package (inherit gnu-gettext)
           (name "gettext-boot0")
           (inputs '())                           ;zero dependencies
           (arguments
            (substitute-keyword-arguments
                `(#:tests? #f
                  ,@(package-arguments gnu-gettext))
              ((#:phases phases)
               `(modify-phases ,phases
                  ;; Build only the tools.
                  (add-after 'unpack 'chdir
                             (lambda _
                               (chdir "gettext-tools")))

                  ;; Some test programs require pthreads, which we don't have.
                  (add-before 'configure 'no-test-programs
                              (lambda _
                                (substitute* "tests/Makefile.in"
                                  (("^PROGRAMS =.*$")
                                   "PROGRAMS =\n"))
                                #t))

                  ;; Don't try to link against libexpat.
                  (delete 'link-expat)
                  (delete 'patch-tests))))))))
    (package-with-bootstrap-guile
     (package-with-explicit-inputs gettext-minimal
                                   %boot1-inputs