diff options
| author | jaapb <jaapb@pkgsrc.org> | 2018-07-11 09:18:28 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2018-07-11 09:18:28 +0000 |
| commit | 061c0a61df4b5baeade900695896a3a59da8b2c8 (patch) | |
| tree | 4f910f7da9d76c5d8a7f3e59ae056a56653a9690 | |
| parent | a854071849d3e98b7b16ac8bff4688a845c56b77 (diff) | |
| download | pkgsrc-061c0a61df4b5baeade900695896a3a59da8b2c8.tar.gz | |
mk/ocaml.mk now handles ulimit commands properly
| -rw-r--r-- | mk/ocaml.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/ocaml.mk b/mk/ocaml.mk index 18e035aafaa..d6d3feedacb 100644 --- a/mk/ocaml.mk +++ b/mk/ocaml.mk @@ -1,4 +1,4 @@ -# $NetBSD: ocaml.mk,v 1.20 2018/05/31 11:22:46 jaapb Exp $ +# $NetBSD: ocaml.mk,v 1.21 2018/07/11 09:18:28 jaapb Exp $ # # This Makefile fragment handles the common variables used by OCaml packages. # @@ -204,7 +204,7 @@ do-configure: # Redefine build target do-build: - ${RUN} cd ${WRKSRC} && \ + ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${OASIS_EXEC} -build ${OASIS_BUILD_ARGS} # Redefine install target @@ -219,7 +219,7 @@ do-install: .if ${OCAML_USE_TOPKG} == "yes" do-build: - ${RUN} cd ${WRKSRC} && \ + ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build .endif # topkg @@ -252,11 +252,13 @@ do-install: do-build: .if !empty(JBUILDER_BUILD_PACKAGES) - ${RUN} cd ${WRKSRC} && jbuilder build -j ${MAKE_JOBS} \ + ${RUN} ${_ULIMIT_CMD} \ + 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} \ + ${RUN} ${_ULIMIT_CMD} \ + cd ${WRKSRC} && jbuilder build -j ${MAKE_JOBS} \ ${JBUILDER_BUILD_FLAGS} ${JBUILDER_BUILD_TARGETS} .endif |