pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk/ocaml.mk now handles ulimit commands properly



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a06411d96985
branches:  trunk
changeset: 382709:a06411d96985
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Wed Jul 11 09:18:28 2018 +0000

description:
mk/ocaml.mk now handles ulimit commands properly

diffstat:

 mk/ocaml.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 2b0d6f153a76 -r a06411d96985 mk/ocaml.mk
--- a/mk/ocaml.mk       Wed Jul 11 09:02:31 2018 +0000
+++ b/mk/ocaml.mk       Wed Jul 11 09:18:28 2018 +0000
@@ -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 @@
 
 # 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 @@
 .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-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
 



Home | Main Index | Thread Index | Old Index