Wed May 25 17:18:13 2022 UTC ()
mk: use lang/ocaml/native.mk instead of wip/*


(wiz)
diff -r1.34 -r1.35 pkgsrc/mk/ocaml.mk
cvs diff -r1.34 -r1.35 pkgsrc/mk/Attic/ocaml.mk (expand / switch to unified diff)

--- pkgsrc/mk/Attic/ocaml.mk 2022/05/24 18:51:54 1.34
+++ pkgsrc/mk/Attic/ocaml.mk 2022/05/25 17:18:13 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ocaml.mk,v 1.34 2022/05/24 18:51:54 jaapb Exp $ 1# $NetBSD: ocaml.mk,v 1.35 2022/05/25 17:18:13 wiz Exp $
2# 2#
3# This Makefile fragment handles the common variables used by OCaml packages. 3# This Makefile fragment handles the common variables used by OCaml packages.
4# It should be included by every package that uses OCaml. 4# It should be included by every package that uses OCaml.
5# 5#
6# Package-settable variables: 6# Package-settable variables:
7# OCAML_USE_FINDLIB 7# OCAML_USE_FINDLIB
8# package uses findlib infrastructure 8# package uses findlib infrastructure
9# OCAML_FINDLIB_DIRS 9# OCAML_FINDLIB_DIRS
10# directories under OCAML_SITELIBDIR that this package installs into 10# directories under OCAML_SITELIBDIR that this package installs into
11# OCAML_FINDLIB_REGISTER 11# OCAML_FINDLIB_REGISTER
12# register findlib directories into OCaml ld.conf 12# register findlib directories into OCaml ld.conf
13# OCAML_USE_OASIS [implies OCAML_USE_FINDLIB] 13# OCAML_USE_OASIS [implies OCAML_USE_FINDLIB]
14# package uses oasis infrastructure 14# package uses oasis infrastructure
@@ -25,27 +25,27 @@ @@ -25,27 +25,27 @@
25# OASIS_BUILD_ARGS 25# OASIS_BUILD_ARGS
26# arguments for oasis build 26# arguments for oasis build
27# Set by this file: 27# Set by this file:
28# OCAML_SITELIBDIR 28# OCAML_SITELIBDIR
29 29
30.if !defined(OCAML_MK) 30.if !defined(OCAML_MK)
31OCAML_MK= # defined 31OCAML_MK= # defined
32 32
33# Text relocations errors when building packages that use 33# Text relocations errors when building packages that use
34# ocamlfind on i386. 34# ocamlfind on i386.
35MKPIE_SUPPORTED= no 35MKPIE_SUPPORTED= no
36 36
37.include "../../mk/bsd.fast.prefs.mk" 37.include "../../mk/bsd.fast.prefs.mk"
38.include "../../wip/ocaml/native.mk" 38.include "../../lang/ocaml/native.mk"
39 39
40 40
41_PKG_VARS.ocaml= \ 41_PKG_VARS.ocaml= \
42 OCAML_USE_FINDLIB \ 42 OCAML_USE_FINDLIB \
43 OCAML_FINDLIB_DIRS \ 43 OCAML_FINDLIB_DIRS \
44 OCAML_FINDLIB_REGISTER \ 44 OCAML_FINDLIB_REGISTER \
45 OCAML_USE_OASIS \ 45 OCAML_USE_OASIS \
46 OCAML_USE_OASIS_DYNRUN \ 46 OCAML_USE_OASIS_DYNRUN \
47 OASIS_BUILD_ARGS \ 47 OASIS_BUILD_ARGS \
48 OCAML_USE_OPAM \ 48 OCAML_USE_OPAM \
49 OCAML_USE_TOPKG \ 49 OCAML_USE_TOPKG \
50 OCAML_TOPKG_NAME \ 50 OCAML_TOPKG_NAME \
51 OCAML_TOPKG_DOCDIR \ 51 OCAML_TOPKG_DOCDIR \