unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ricardo Wurmus <rekado@elephly.net>
To: Gabriel Hondet <gabrielhondet@gmail.com>
Cc: 34627@debbugs.gnu.org
Subject: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113.
Date: Mon, 08 Apr 2019 15:30:04 +0200	[thread overview]
Message-ID: <87ef6cfwv7.fsf@elephly.net> (raw)
In-Reply-To: <87zhp31qu1.fsf@gmail.com>


Hi Gabriel,

>> Can you add comments explaining why these phases are replaced?
> From dde2129019d0490909e764181b1f332c3faefa5f Mon Sep 17 00:00:00 2001
> From: gabrielhdt <gabrielhondet@gmail.com>
> Date: Sat, 23 Feb 2019 09:50:38 +0100
> Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.
>
> * gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
> ---
>  gnu/packages/ocaml.scm | 34 +++++++++++++++++++++-------------
>  1 file changed, 21 insertions(+), 13 deletions(-)
>
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index 9a807a4cb6..0ad33f6b25 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -639,37 +639,45 @@ Emacs.")
>  (define-public ocaml-menhir
>    (package
>      (name "ocaml-menhir")
> -    (version "20161115")
> +    (version "20181113")
>      (source (origin
> -              (method url-fetch)
> -              (uri (string-append
> -                    "http://gallium.inria.fr/~fpottier/menhir/"
> -                    "menhir-" version ".tar.gz"))
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://gitlab.inria.fr/fpottier/menhir.git")
> +                    (commit version)))
> +              (file-name (git-file-name name version))
>                (sha256
>                 (base32
> -                "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
> -    (build-system gnu-build-system)
> -    (inputs
> -     `(("ocaml" ,ocaml)))
> +                "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
> +    (build-system ocaml-build-system)
>      (native-inputs
>       `(("ocamlbuild" ,ocamlbuild)))
>      (arguments
> -     `(#:parallel-build? #f ; Parallel build causes failure
> -       #:tests? #f ; No check target
> +     `(#:tests? #f ; No check target
>         #:phases
>         (modify-phases %standard-phases
>           (replace 'configure
>             (lambda* (#:key outputs #:allow-other-keys)
>               (let ((out (assoc-ref outputs "out")))
>                 (setenv "PREFIX" out))
> +             #t))
> +         (replace 'build
> +           (lambda _
> +             ;; invoke the right makefile
> +             (invoke "make" "-f" "Makefile" "USE_OCAMLFIND=true" "all")
> +             #t))
> +         (replace 'install
> +           (lambda _
> +             ;; invoke the right makefile
> +             (invoke "make" "-f" "Makefile" "install")

Is the problem here that GNUmakefile exists?  Could we simply remove
that file instead of replacing the phases?  When replacing the phases
you should also pass the default make-flags and ensure that parallel
building is enabled.

Removing the other makefile seems to be the better option.

--
Ricardo

  reply	other threads:[~2019-04-08 13:31 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-23  8:50 [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113 Gabriel Hondet
2019-02-26  3:58 ` Leo Famulari
2019-04-06  8:27   ` Gabriel Hondet
2019-04-08 13:30     ` Ricardo Wurmus [this message]
2019-04-10 17:11       ` Gabriel Hondet
2019-05-03 18:30 ` Gabriel Hondet
2019-05-03 18:48   ` bug#34627: " Julien Lepiller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87ef6cfwv7.fsf@elephly.net \
    --to=rekado@elephly.net \
    --cc=34627@debbugs.gnu.org \
    --cc=gabrielhondet@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).