Re: [PATCH 1/2] gnu: libtool: Use 'modify-phases'.

[Marius Bakke]

Leo Famulari <address@hidden> writes:

> On Sun, Jan 01, 2017 at 03:24:27PM +0000, ng0 wrote:
>> * gnu/packages/autotools.scm (libtool): Use 'modify-phases'.
>> [arguments]: Use 'modify-phases'.
>
>> +                     ("help2man" ,help2man) ;because we modify ltmain.sh
>
> This should go in the other patch, right?
>
> I attached a revised patch series with that change, and another bug fix.
> From 7f0fce3f71be7da461de89fb5f6f47289c6498b6 Mon Sep 17 00:00:00 2001
> From: ng0 <address@hidden>
> Date: Sun, 1 Jan 2017 15:24:27 +0000
> Subject: [PATCH 1/3] gnu: libtool: Use 'modify-phases'.
>
> * gnu/packages/autotools.scm (libtool): Use 'modify-phases'.
> [arguments]: Use 'modify-phases'.
>
> Signed-off-by: Leo Famulari <address@hidden>
> ---
>  gnu/packages/autotools.scm | 30 ++++++++++++++++--------------
>  1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
> index 72492e70e..64a1e68bf 100644
> --- a/gnu/packages/autotools.scm
> +++ b/gnu/packages/autotools.scm
> @@ -5,6 +5,7 @@
>  ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <address@hidden>
>  ;;; Copyright © 2015 Mark H Weaver <address@hidden>
>  ;;; Copyright © 2016 David Thompson <address@hidden>
> +;;; Copyright © 2017 ng0 <address@hidden>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -313,21 +314,22 @@ Makefile, simplifying the entire process for the 
> developer.")
>                                        (or (%current-target-system)
>                                            (%current-system))))
>  
> -       #:phases (alist-cons-before
> -                 'check 'pre-check
> -                 (lambda* (#:key inputs #:allow-other-keys)
> -                   ;; Run the test suite in parallel, if possible.
> -                   (setenv "TESTSUITEFLAGS"
> -                           (string-append
> -                            "-j"
> -                            (number->string (parallel-job-count))))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'check 'pre-check
> +                     (lambda* (#:key inputs #:allow-other-keys)
> +                       ;; Run the test suite in parallel, if possible.
> +                       (setenv "TESTSUITEFLAGS"
> +                               (string-append
> +                                "-j"
> +                                (number->string (parallel-job-count))))
> +
> +                       ;; Path references to /bin/sh.
> +                       (let ((bash (assoc-ref inputs "bash")))
> +                         (substitute* "tests/testsuite"
> +                           (("/bin/sh")
> +                            (string-append bash "/bin/bash")))))))))

There was a discussion about making "substitute*" return #t if one or
more substitutions were done, is that implemented yet? If not, please
make sure phases end on a truthy value :-)

signature.asc
Description: PGP signature