CVS commit: pkgsrc/lang/ocaml

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Nov 30 00:32:16 UTC 2024

Modified Files:
        pkgsrc/lang/ocaml: ocaml.mk

Log Message:
lang/ocaml/ocaml.mk: Also set MAKE_ENV for !DUNE_BUILD_PACKAGES

There is an if, and two build commands, which are mostly the same, but
with differences for [mysterious dune package stuff].  The
non-dune-package arm of the if didn't set the MAKE_ENV.  I'm calling
that a bug and adding it.

I've been running with this for a while, building various things, and
it seems ok.  Proposed on tech-pkg with no objections and one positive
comment.  If this breaks things for you, feel free to revert without
asking me, and then you get to be in charge of making ocaml work.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ocaml/ocaml.mk

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

Modified files:

Index: pkgsrc/lang/ocaml/ocaml.mk
diff -u pkgsrc/lang/ocaml/ocaml.mk:1.2 pkgsrc/lang/ocaml/ocaml.mk:1.3
--- pkgsrc/lang/ocaml/ocaml.mk:1.2      Sun Apr  9 07:28:27 2023
+++ pkgsrc/lang/ocaml/ocaml.mk  Sat Nov 30 00:32:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml.mk,v 1.2 2023/04/09 07:28:27 wiz Exp $
+# $NetBSD: ocaml.mk,v 1.3 2024/11/30 00:32:16 gdt Exp $
 #
 # This Makefile fragment handles the common variables used by OCaml packages.
 # It should be included by every package that uses OCaml.
@@ -241,7 +241,8 @@ do-build:
                ${DUNE_BUILD_TARGETS}
 .  else
        ${RUN} ${_ULIMIT_CMD} \
-               cd ${WRKSRC} && dune build --profile release -j ${MAKE_JOBS:U1} \
+               cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+               dune build --profile release -j ${MAKE_JOBS:U1} \
                ${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
 .  endif