From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:42318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDUMZ-0000OL-NI for guix-patches@gnu.org; Mon, 08 Apr 2019 09:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDUMY-0003oB-Fq for guix-patches@gnu.org; Mon, 08 Apr 2019 09:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35554) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDUMY-0003nk-2j for guix-patches@gnu.org; Mon, 08 Apr 2019 09:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hDUMX-00010e-U6 for guix-patches@gnu.org; Mon, 08 Apr 2019 09:31:01 -0400 Subject: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113. Resent-Message-ID: References: <87d0ni28fk.fsf@gmail.com> <20190226035851.GA8289@jasmine.lan> <87zhp31qu1.fsf@gmail.com> From: Ricardo Wurmus In-reply-to: <87zhp31qu1.fsf@gmail.com> Date: Mon, 08 Apr 2019 15:30:04 +0200 Message-ID: <87ef6cfwv7.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Gabriel Hondet Cc: 34627@debbugs.gnu.org Hi Gabriel, >> Can you add comments explaining why these phases are replaced? > From dde2129019d0490909e764181b1f332c3faefa5f Mon Sep 17 00:00:00 2001 > From: gabrielhdt > 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