gnu: ocambuild: Update to 0.14.0.
* gnu/packages/ocaml.scm (ocamlbuild): Update to 0.14.0. [build-system]: Use ocaml-build-system.master
parent
1ef71f5225
commit
7a4780ce9d
|
@ -233,7 +233,7 @@ functional, imperative and object-oriented styles of programming.")
|
||||||
(define-public ocamlbuild
|
(define-public ocamlbuild
|
||||||
(package
|
(package
|
||||||
(name "ocamlbuild")
|
(name "ocamlbuild")
|
||||||
(version "0.13.1")
|
(version "0.14.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -242,31 +242,22 @@ functional, imperative and object-oriented styles of programming.")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0v37vjvdqw35yvj8ipmlzmwf1jhip0hbsmcbdcn9cnj12p3mr6k7"))))
|
(base32 "1hb5mcdz4wv7sh1pj7dq9q4fgz5h3zg7frpiya6s8zd3ypwzq0kh"))))
|
||||||
(build-system gnu-build-system)
|
(build-system ocaml-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:test-target "test"
|
`(#:make-flags
|
||||||
#:tests? #f; tests require findlib
|
|
||||||
#:make-flags
|
|
||||||
(list (string-append "OCAMLBUILD_PREFIX=" (assoc-ref %outputs "out"))
|
(list (string-append "OCAMLBUILD_PREFIX=" (assoc-ref %outputs "out"))
|
||||||
(string-append "OCAMLBUILD_BINDIR=" (assoc-ref %outputs "out")
|
(string-append "OCAMLBUILD_BINDIR=" (assoc-ref %outputs "out")
|
||||||
"/bin")
|
"/bin")
|
||||||
(string-append "OCAMLBUILD_LIBDIR=" (assoc-ref %outputs "out")
|
(string-append "OCAMLBUILD_LIBDIR=" (assoc-ref %outputs "out")
|
||||||
"/lib/ocaml/site-lib")
|
"/lib/ocaml/site-lib")
|
||||||
(string-append "OCAMLBUILD_MANDIR=" (assoc-ref %outputs "out")
|
(string-append "OCAMLBUILD_MANDIR=" (assoc-ref %outputs "out")
|
||||||
"/share/man"))
|
"/share/man"))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(delete 'bootstrap)
|
(delete 'configure))
|
||||||
(delete 'configure)
|
; some failures because of changes in OCaml's error message formating
|
||||||
(add-before 'build 'findlib-environment
|
#:tests? #f))
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let* ((out (assoc-ref outputs "out")))
|
|
||||||
(setenv "OCAMLFIND_DESTDIR" (string-append out "/lib/ocaml/site-lib"))
|
|
||||||
(setenv "OCAMLFIND_LDCONF" "ignore")
|
|
||||||
#t))))))
|
|
||||||
(native-inputs
|
|
||||||
`(("ocaml" ,ocaml)))
|
|
||||||
(home-page "https://github.com/ocaml/ocamlbuild")
|
(home-page "https://github.com/ocaml/ocamlbuild")
|
||||||
(synopsis "OCaml build tool")
|
(synopsis "OCaml build tool")
|
||||||
(description "OCamlbuild is a generic build tool, that has built-in rules
|
(description "OCamlbuild is a generic build tool, that has built-in rules
|
||||||
|
|
Reference in New Issue