Patchwork build coqide

login
register
mail settings
Submitter Julien Lepiller
Date Dec. 13, 2016, 10:36 a.m.
Message ID <a6513939e9047ad3cd05726c0e5bded2@lepiller.eu>
Download mbox | patch
Permalink /patch/18424/
State New
Headers show

Comments

Julien Lepiller - Dec. 13, 2016, 10:36 a.m.
Le 2016-12-13 03:19, Eric Bavier a écrit :
> On Mon, 12 Dec 2016 23:57:35 +0100
> Julien Lepiller <julien@lepiller.eu> wrote:
> 
>> hi,
>> 
>> here are a few ocaml-related patches. The first one adds a
>> native-search-path so ocaml-findlib can find the libraries it
>> installs. Next, lablgtk is updated and installed using the recommended
>> way, with findlib. Then this new lablgtk is used to build coqide.
> 
>> +                               "-lablgtkdir" (string-append 
>> lablgtkdir
>> +                                               
>> "/lib/ocaml/site-lib/lablgtk2/")
> 
> Is there additional benefit to the ocaml search dir OCAMLPATH?  I would
> expect coq's build system to be able to find lablgtk from OCAMLPATH
> without needing to pass the configure flags.
oh ! how could I not see it... OCAMLPATH is already defined differently 
by the ocaml package... I guess there was an update I didn't see since I 
wrote these patches (or maybe I'm just blind). Here is a a new version 
of the patches. I added ocaml-findlib to the native-inputs of coq so its 
configure script can find lablgtk without the option. and lablgtk 
doesn't need to be installed in site-lib anymore. Is this correct, or 
should the library be installed in site-lib, and this directory added to 
OCAMLPATH?

By the way, is there someone working on an ocaml-build-system?

> 
> `~Eric

Patch

From 330fa542eebed022b4e99abe69e593b5a8f5c4f5 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Tue, 13 Dec 2016 11:22:06 +0100
Subject: [PATCH 3/3] gnu: coq: Build coqide

* gnu/packages/ocaml.scm (coq): Build coqide.
---
 gnu/packages/ocaml.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 555e3fd..c5784db 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -341,9 +341,11 @@  written in Objective Caml.")
     (build-system gnu-build-system)
     (native-inputs
      `(("texlive" ,texlive)
+       ("findlib" ,ocaml-findlib)
        ("hevea" ,hevea)))
     (inputs
      `(("ocaml" ,ocaml)
+       ("lablgtk" ,lablgtk)
        ("camlp5" ,camlp5)))
     (arguments
      `(#:phases
@@ -356,7 +358,8 @@  written in Objective Caml.")
                (zero? (system* "./configure"
                                "-prefix" out
                                "-mandir" mandir
-                               "-browser" browser)))))
+                               "-browser" browser
+                               "-coqide" "opt")))))
          (replace 'build
            (lambda _
              (zero? (system* "make" "-j" (number->string
-- 
2.7.4