Tue Mar 5 16:14:35 2019 UTC ()
Added variable OCAML_TOPKG_FLAGS


(jaapb)
diff -r1.22 -r1.23 pkgsrc/mk/ocaml.mk
cvs diff -r1.22 -r1.23 pkgsrc/mk/Attic/ocaml.mk (expand / switch to unified diff)

--- pkgsrc/mk/Attic/ocaml.mk 2018/11/27 15:03:28 1.22
+++ pkgsrc/mk/Attic/ocaml.mk 2019/03/05 16:14:35 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ocaml.mk,v 1.22 2018/11/27 15:03:28 jaapb Exp $ 1# $NetBSD: ocaml.mk,v 1.23 2019/03/05 16:14:35 jaapb 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# 4#
5# Build def variables: 5# Build def variables:
6# OCAML_USE_OPT_COMPILER  6# OCAML_USE_OPT_COMPILER
7# if set to yes, will enable optimised (native code) compilation 7# if set to yes, will enable optimised (native code) compilation
8# default value: depends on architecture 8# default value: depends on architecture
9# 9#
10# PLIST variable: 10# PLIST variable:
11# PLIST.ocaml-opt for files only installed when using the optimised compiler 11# PLIST.ocaml-opt for files only installed when using the optimised compiler
12# Set based on OCAML_USE_OPT_COMPILER 12# Set based on OCAML_USE_OPT_COMPILER
13#  13#
14# Package-settable variables: 14# Package-settable variables:
@@ -46,26 +46,27 @@ BUILD_DEFS+= OCAML_USE_OPT_COMPILER @@ -46,26 +46,27 @@ BUILD_DEFS+= OCAML_USE_OPT_COMPILER
46 46
47_VARGROUPS+= ocaml 47_VARGROUPS+= ocaml
48_PKG_VARS.ocaml= \ 48_PKG_VARS.ocaml= \
49 OCAML_USE_FINDLIB \ 49 OCAML_USE_FINDLIB \
50 OCAML_FINDLIB_DIRS \ 50 OCAML_FINDLIB_DIRS \
51 OCAML_FINDLIB_REGISTER \ 51 OCAML_FINDLIB_REGISTER \
52 OCAML_USE_OASIS \ 52 OCAML_USE_OASIS \
53 OCAML_USE_OASIS_DYNRUN \ 53 OCAML_USE_OASIS_DYNRUN \
54 OASIS_BUILD_ARGS \ 54 OASIS_BUILD_ARGS \
55 OCAML_USE_OPAM \ 55 OCAML_USE_OPAM \
56 OCAML_USE_TOPKG \ 56 OCAML_USE_TOPKG \
57 OCAML_TOPKG_NAME \ 57 OCAML_TOPKG_NAME \
58 OCAML_TOPKG_DOCDIR \ 58 OCAML_TOPKG_DOCDIR \
 59 OCAML_TOPKG_FLAGS \
59 OCAML_TOPKG_TARGETS \ 60 OCAML_TOPKG_TARGETS \
60 OCAML_TOPKG_OPTIONAL_TARGETS \ 61 OCAML_TOPKG_OPTIONAL_TARGETS \
61 OCAML_USE_JBUILDER \ 62 OCAML_USE_JBUILDER \
62 JBUILDER_BUILD_FLAGS \ 63 JBUILDER_BUILD_FLAGS \
63 JBUILDER_BUILD_PACKAGES \ 64 JBUILDER_BUILD_PACKAGES \
64 JBUILDER_BUILD_TARGETS \ 65 JBUILDER_BUILD_TARGETS \
65 OCAML_USE_DUNE \ 66 OCAML_USE_DUNE \
66 DUNE_BUILD_FLAGS \ 67 DUNE_BUILD_FLAGS \
67 DUNE_BUILD_PACKAGES \ 68 DUNE_BUILD_PACKAGES \
68 DUNE_BUILD_TARGETS \ 69 DUNE_BUILD_TARGETS \
69 OCAML_BUILD_ARGS \ 70 OCAML_BUILD_ARGS \
70 OPAM_INSTALL_FILES 71 OPAM_INSTALL_FILES
71_DEF_VARS.ocaml= \ 72_DEF_VARS.ocaml= \
@@ -83,29 +84,27 @@ OCAML_USE_OASIS?= no @@ -83,29 +84,27 @@ OCAML_USE_OASIS?= no
83OCAML_USE_OASIS_DYNRUN?= no 84OCAML_USE_OASIS_DYNRUN?= no
84 85
85# Default value of OCAML_USE_TOPKG 86# Default value of OCAML_USE_TOPKG
86OCAML_USE_TOPKG?= no 87OCAML_USE_TOPKG?= no
87 88
88# Default value of OCAML_USE_JBUILDER 89# Default value of OCAML_USE_JBUILDER
89OCAML_USE_JBUILDER?= no 90OCAML_USE_JBUILDER?= no
90 91
91# Default value of OCAML_USE_DUNE 92# Default value of OCAML_USE_DUNE
92OCAML_USE_DUNE?= no 93OCAML_USE_DUNE?= no
93 94
94OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//} 95OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//}
95OCAML_TOPKG_DOCDIR?= ${PREFIX}/share/doc 96OCAML_TOPKG_DOCDIR?= ${PREFIX}/share/doc
96 97OCAML_TOPKG_FLAGS?= # empty
97OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//} 
98 
99OCAML_TOPKG_TARGETS?= # empty 98OCAML_TOPKG_TARGETS?= # empty
100OCAML_TOPKG_OPTIONAL_TARGETS?= # empty 99OCAML_TOPKG_OPTIONAL_TARGETS?= # empty
101OCAML_TOPKG_NATIVE_TARGETS?= # empty 100OCAML_TOPKG_NATIVE_TARGETS?= # empty
102 101
103OPAM_INSTALL_FILES?= ${OCAML_TOPKG_NAME} 102OPAM_INSTALL_FILES?= ${OCAML_TOPKG_NAME}
104JBUILDER_BUILD_FLAGS?= # empty 103JBUILDER_BUILD_FLAGS?= # empty
105JBUILDER_BUILD_TARGETS?= @install 104JBUILDER_BUILD_TARGETS?= @install
106JBUILDER_BUILD_PACKAGES?= # empty 105JBUILDER_BUILD_PACKAGES?= # empty
107DUNE_BUILD_FLAGS?= # empty 106DUNE_BUILD_FLAGS?= # empty
108DUNE_BUILD_TARGETS?= @install 107DUNE_BUILD_TARGETS?= @install
109DUNE_BUILD_PACKAGES?= # empty 108DUNE_BUILD_PACKAGES?= # empty
110 109
111# Default value of OASIS_BUILD_ARGS 110# Default value of OASIS_BUILD_ARGS
@@ -225,27 +224,27 @@ do-build: @@ -225,27 +224,27 @@ do-build:
225# Redefine install target 224# Redefine install target
226do-install: 225do-install:
227 ${RUN} cd ${WRKSRC} && \ 226 ${RUN} cd ${WRKSRC} && \
228 ${OASIS_EXEC} -install --destdir ${DESTDIR} --prefix ${PREFIX} 227 ${OASIS_EXEC} -install --destdir ${DESTDIR} --prefix ${PREFIX}
229.endif 228.endif
230 229
231# 230#
232# topkg targets 231# topkg targets
233# 232#
234.if ${OCAML_USE_TOPKG} == "yes" 233.if ${OCAML_USE_TOPKG} == "yes"
235 234
236do-build: 235do-build:
237 ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \ 236 ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
238 ${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build 237 ${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build ${OCAML_TOPKG_FLAGS}
239 238
240.endif # topkg 239.endif # topkg
241 240
242# 241#
243# opam targets 242# opam targets
244# 243#
245.if ${OCAML_USE_OPAM} == "yes"  244.if ${OCAML_USE_OPAM} == "yes"
246 245
247do-install: 246do-install:
248 ${RUN} for i in ${OPAM_INSTALL_FILES}; do \ 247 ${RUN} for i in ${OPAM_INSTALL_FILES}; do \
249 cd ${WRKSRC} && opaline -install-cmd "${INSTALL_DATA}" \ 248 cd ${WRKSRC} && opaline -install-cmd "${INSTALL_DATA}" \
250 -exec-install-cmd "${INSTALL_PROGRAM}" \ 249 -exec-install-cmd "${INSTALL_PROGRAM}" \
251 -name $$i \ 250 -name $$i \