Skip to content

Commit c77a618

Browse files
committed
ocaml: merge some changes from ../lang and add TODO
1 parent 7351d5f commit c77a618

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

ocaml/Makefile.common

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
# $NetBSD: Makefile.common,v 1.65 2023/04/09 07:27:48 wiz Exp $
1+
# $NetBSD: Makefile.common,v 1.67 2024/11/30 01:34:47 gdt Exp $
22

3-
# used by x11/labltk/Makefile
3+
# not used by anything else these days
4+
5+
# Please do not update to ocaml 5.x without discussion, as the
6+
# consensus is mostly that those versions are not yet baked, and will
7+
# cause hard-to-debug problems.
48
DISTNAME= ocaml-5.2.0
59
CATEGORIES= lang
610
# unreliable
@@ -9,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
913
GITHUB_TAG= ${PKGVERSION_NOREV}
1014

1115
MAINTAINER= [email protected]
16+
#MAINTAINER+= [email protected]
1217
HOMEPAGE= https://ocaml.org/
1318
COMMENT= The latest implementation of the Caml dialect of ML
1419
LICENSE= gnu-gpl-v2

ocaml/TODO

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
- update to 5.2.1
2+
- explain and clean up the bdb stuff in lang/ocaml
3+
- sort PLISTs consistently between lang/ocaml and this, to enable
4+
understanding what is changed
5+
- create COMMIT_MESSAGE
6+
+ explain why *all* the patches in lang/ocaml are missing
7+
+ explain PLIST changes
8+
+ explain why pic and flambda options are being removed
9+
- create meta-pkgs/bulk-test-ocaml and test
10+
- run tests and assess

ocaml/ocaml.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: ocaml.mk,v 1.2 2023/04/09 07:28:27 wiz Exp $
1+
# $NetBSD: ocaml.mk,v 1.3 2024/11/30 00:32:16 gdt Exp $
22
#
33
# This Makefile fragment handles the common variables used by OCaml packages.
44
# It should be included by every package that uses OCaml.
@@ -241,7 +241,8 @@ do-build:
241241
${DUNE_BUILD_TARGETS}
242242
. else
243243
${RUN} ${_ULIMIT_CMD} \
244-
cd ${WRKSRC} && dune build --profile release -j ${MAKE_JOBS:U1} \
244+
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
245+
dune build --profile release -j ${MAKE_JOBS:U1} \
245246
${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
246247
. endif
247248

0 commit comments

Comments
 (0)