git: e23df5c93afc - main - devel/ocaml-ocamlbuild: fix install in presence of `devel/ocaml-findlib'

Alexey Dokuchaev danfe at FreeBSD.org
Mon Sep 6 18:11:11 UTC 2021


The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e23df5c93afcc5b59e421073e8cb072c0922cebd

commit e23df5c93afcc5b59e421073e8cb072c0922cebd
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-09-06 18:10:28 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-09-06 18:10:29 +0000

    devel/ocaml-ocamlbuild: fix install in presence of `devel/ocaml-findlib'
    
    If ocamlfind(1) is installed, its output of `printconf destdir' is used
    as OCAMLBUILD_LIBDIR, which does not match OCAML_LIBDIR and is actually
    not a single directory, but colon-separated path list.  Specify correct
    destination explicitly to avoid this type of side effects.  While at it,
    hook the test suite to our framework.
    
    PR:             238905
    Reported by:    John Hein
---
 devel/ocaml-ocamlbuild/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/devel/ocaml-ocamlbuild/Makefile b/devel/ocaml-ocamlbuild/Makefile
index 5eecddd7bd59..903a535ca88d 100644
--- a/devel/ocaml-ocamlbuild/Makefile
+++ b/devel/ocaml-ocamlbuild/Makefile
@@ -16,5 +16,8 @@ GH_ACCOUNT=	ocaml
 USE_OCAML=	yes
 
 ALL_TARGET=	configure all
+MAKE_ENV=	OCAMLBUILD_LIBDIR=${PREFIX}/${OCAML_LIBDIR}
+TEST_TARGET=	test
+TEST_ENV=	VERBOSE=1
 
 .include <bsd.port.mk>


More information about the dev-commits-ports-all mailing list