Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1543331008235460"
MIME-Version: 1.0
Date: Tue, 27 Nov 2018 15:03:28 +0000
From: "Jaap Boender" <jaapb@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: jaapb@netbsd.org
Message-Id: <20181127150328.CF666FB1F@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1543331008235460
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jaapb
Date:		Tue Nov 27 15:03:28 UTC 2018

Modified Files:
	pkgsrc/mk: ocaml.mk

Log Message:
Updated mk/ocaml.mk to add support for dune


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/ocaml.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1543331008235460
Content-Disposition: inline
Content-Length: 2731
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/ocaml.mk
diff -u pkgsrc/mk/ocaml.mk:1.21 pkgsrc/mk/ocaml.mk:1.22
--- pkgsrc/mk/ocaml.mk:1.21	Wed Jul 11 09:18:28 2018
+++ pkgsrc/mk/ocaml.mk	Tue Nov 27 15:03:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml.mk,v 1.21 2018/07/11 09:18:28 jaapb Exp $
+# $NetBSD: ocaml.mk,v 1.22 2018/11/27 15:03:28 jaapb Exp $
 #
 # This Makefile fragment handles the common variables used by OCaml packages.
 #
@@ -28,6 +28,8 @@
 # package uses topkg [implies OCAML_USE_FINDLIB]
 # OCAML_USE_JBUILDER
 # package uses jbuilder [implies OCAML_USE_OPAM]
+# OCAML_USE_DUNE
+# package uses dune [implies OCAML_USE_OPAM]
 # OCAML_TOPKG_DOCDIR
 # different targets for topkg (bytecode, optional bytecode, native)
 # OASIS_BUILD_ARGS
@@ -60,6 +62,10 @@ _PKG_VARS.ocaml=	\
 	JBUILDER_BUILD_FLAGS \
 	JBUILDER_BUILD_PACKAGES \
 	JBUILDER_BUILD_TARGETS \
+	OCAML_USE_DUNE \
+	DUNE_BUILD_FLAGS \
+	DUNE_BUILD_PACKAGES \
+	DUNE_BUILD_TARGETS \
 	OCAML_BUILD_ARGS \
 	OPAM_INSTALL_FILES
 _DEF_VARS.ocaml=	\
@@ -82,6 +88,9 @@ OCAML_USE_TOPKG?=	no
 # Default value of OCAML_USE_JBUILDER
 OCAML_USE_JBUILDER?=	no
 
+# Default value of OCAML_USE_DUNE
+OCAML_USE_DUNE?=	no
+
 OCAML_TOPKG_NAME?=	${PKGBASE:S/^ocaml-//}
 OCAML_TOPKG_DOCDIR?=	${PREFIX}/share/doc
 
@@ -95,6 +104,9 @@ OPAM_INSTALL_FILES?=	${OCAML_TOPKG_NAME}
 JBUILDER_BUILD_FLAGS?=	# empty
 JBUILDER_BUILD_TARGETS?=	@install
 JBUILDER_BUILD_PACKAGES?=	# empty
+DUNE_BUILD_FLAGS?=	# empty
+DUNE_BUILD_TARGETS?=	@install
+DUNE_BUILD_PACKAGES?=	# empty
 
 # Default value of OASIS_BUILD_ARGS
 OASIS_BUILD_ARGS?=	# empty
@@ -132,10 +144,13 @@ CONFIGURE_ARGS+=	--override is_native fa
 .endif
 .endif
 
-# Configure stuff for JBUILDER
+# Configure stuff for JBUILDER/DUNE
 .if ${OCAML_USE_JBUILDER} == "yes"
 .include "../../devel/ocaml-jbuilder/buildlink3.mk"
 OCAML_USE_OPAM?=	yes
+.elif ${OCAML_USE_DUNE} == "yes"
+.include "../../devel/ocaml-dune/buildlink3.mk"
+OCAML_USE_OPAM?=	yes
 .else
 OCAML_USE_OPAM?=	no
 .endif
@@ -243,7 +258,7 @@ do-install:
 		$$i.install; \
 	done
 
-.endif # topkg-opam
+.endif # opam
 
 #
 # jbuilder targets
@@ -262,7 +277,26 @@ do-build:
 		${JBUILDER_BUILD_FLAGS} ${JBUILDER_BUILD_TARGETS}
 .endif
 
-.endif # topkg-jbuilder
+.endif # jbuilder
+
+#
+# dune targets
+#
+.if ${OCAML_USE_DUNE} == "yes"
+
+do-build:
+.if !empty(DUNE_BUILD_PACKAGES)
+	${RUN} ${_ULIMIT_CMD} \
+		cd ${WRKSRC} && dune build -j ${MAKE_JOBS} \
+		${DUNE_BUILD_FLAGS} -p ${DUNE_BUILD_PACKAGES:ts,} \
+		${DUNE_BUILD_TARGETS}
+.else
+	${RUN} ${_ULIMIT_CMD} \
+		cd ${WRKSRC} && dune build --profile release -j ${MAKE_JOBS} \
+		${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
+.endif
+
+.endif # dune
 
 # Add dependency on ocaml.
 .include "../../lang/ocaml/buildlink3.mk"


--_----------=_1543331008235460--