Received: by mail.netbsd.org (Postfix, from userid 605) id A6ACD84DA4; Fri, 8 Sep 2017 08:39:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2E19584D87 for ; Fri, 8 Sep 2017 08:39:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id QV7cToVZleVd for ; Fri, 8 Sep 2017 08:39:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7901784D86 for ; Fri, 8 Sep 2017 08:39:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 74371FA97; Fri, 8 Sep 2017 08:39:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1504859946191140" MIME-Version: 1.0 Date: Fri, 8 Sep 2017 08:39:06 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20170908083906.74371FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1504859946191140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Fri Sep 8 08:39:06 UTC 2017 Modified Files: pkgsrc/mk: ocaml.mk Log Message: Added variable to have ocaml-jbuilder only build certain packages To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/mk/ocaml.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1504859946191140 Content-Disposition: inline Content-Length: 1327 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.14 pkgsrc/mk/ocaml.mk:1.15 --- pkgsrc/mk/ocaml.mk:1.14 Wed Jul 26 09:41:31 2017 +++ pkgsrc/mk/ocaml.mk Fri Sep 8 08:39:06 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ocaml.mk,v 1.14 2017/07/26 09:41:31 jaapb Exp $ +# $NetBSD: ocaml.mk,v 1.15 2017/09/08 08:39:06 jaapb Exp $ # # This Makefile fragment handles the common variables used by OCaml packages. # @@ -58,6 +58,7 @@ _PKG_VARS.ocaml= \ OCAML_TOPKG_OPTIONAL_TARGETS \ OCAML_USE_JBUILDER \ JBUILDER_BUILD_FLAGS \ + JBUILDER_BUILD_PACKAGES \ JBUILDER_BUILD_TARGETS \ OCAML_BUILD_ARGS \ OPAM_INSTALL_FILES @@ -96,6 +97,7 @@ OCAML_TOPKG_NATIVE_TARGETS?= # empty OPAM_INSTALL_FILES?= ${OCAML_TOPKG_NAME} JBUILDER_BUILD_FLAGS?= # empty JBUILDER_BUILD_TARGETS?= @install +JBUILDER_BUILD_PACKAGES?= # empty # Default value of OASIS_BUILD_ARGS OASIS_BUILD_ARGS?= # empty @@ -243,8 +245,14 @@ do-install: .if ${OCAML_USE_JBUILDER} == "yes" do-build: +.if !empty(JBUILDER_BUILD_PACKAGES) + ${RUN} cd ${WRKSRC} && jbuilder build -j ${MAKE_JOBS} \ + ${JBUILDER_BUILD_FLAGS} -p ${JBUILDER_BUILD_PACKAGES:ts,} \ + ${JBUILDER_BUILD_TARGETS} +.else ${RUN} cd ${WRKSRC} && jbuilder build -j ${MAKE_JOBS} \ ${JBUILDER_BUILD_FLAGS} ${JBUILDER_BUILD_TARGETS} +.endif .endif # topkg-jbuilder --_----------=_1504859946191140--