Fri Sep 8 22:18:46 2017 UTC ()
Moved jbuilder detection forward so it deals with opam properly


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

--- pkgsrc/mk/Attic/ocaml.mk 2017/09/08 19:09:26 1.16
+++ pkgsrc/mk/Attic/ocaml.mk 2017/09/08 22:18:46 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ocaml.mk,v 1.16 2017/09/08 19:09:26 jaapb Exp $ 1# $NetBSD: ocaml.mk,v 1.17 2017/09/08 22:18:46 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:
@@ -66,29 +66,26 @@ _DEF_VARS.ocaml= \ @@ -66,29 +66,26 @@ _DEF_VARS.ocaml= \
66 OCAML_USE_OPT_COMPILER 66 OCAML_USE_OPT_COMPILER
67_SYS_VARS.ocaml= \ 67_SYS_VARS.ocaml= \
68 OCAML_SITELIBDIR 68 OCAML_SITELIBDIR
69 69
70# Default value of OCAML_USE_FINDLIB 70# Default value of OCAML_USE_FINDLIB
71OCAML_USE_FINDLIB?= no 71OCAML_USE_FINDLIB?= no
72 72
73# Default value of OCAML_USE_OASIS 73# Default value of OCAML_USE_OASIS
74OCAML_USE_OASIS?= no 74OCAML_USE_OASIS?= no
75 75
76# Default value of OCAML_USE_OASIS_DYNRUN 76# Default value of OCAML_USE_OASIS_DYNRUN
77OCAML_USE_OASIS_DYNRUN?= no 77OCAML_USE_OASIS_DYNRUN?= no
78 78
79# Default value of OCAML_USE_OPAM 
80OCAML_USE_OPAM?= no 
81 
82# Default value of OCAML_USE_TOPKG 79# Default value of OCAML_USE_TOPKG
83OCAML_USE_TOPKG?= no 80OCAML_USE_TOPKG?= no
84 81
85# Default value of OCAML_USE_JBUILDER 82# Default value of OCAML_USE_JBUILDER
86OCAML_USE_JBUILDER?= no 83OCAML_USE_JBUILDER?= no
87 84
88OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//} 85OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//}
89OCAML_TOPKG_DOCDIR?= ${PREFIX}/share/doc 86OCAML_TOPKG_DOCDIR?= ${PREFIX}/share/doc
90 87
91OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//} 88OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//}
92 89
93OCAML_TOPKG_TARGETS?= # empty 90OCAML_TOPKG_TARGETS?= # empty
94OCAML_TOPKG_OPTIONAL_TARGETS?= # empty 91OCAML_TOPKG_OPTIONAL_TARGETS?= # empty
@@ -125,44 +122,46 @@ OCAML_USE_OASIS= yes @@ -125,44 +122,46 @@ OCAML_USE_OASIS= yes
125.if ${OCAML_USE_OASIS} == "yes" 122.if ${OCAML_USE_OASIS} == "yes"
126OCAML_USE_FINDLIB= yes 123OCAML_USE_FINDLIB= yes
127HAS_CONFIGURE= yes 124HAS_CONFIGURE= yes
128CONFIGURE_ARGS+= --destdir "${DESTDIR}" 125CONFIGURE_ARGS+= --destdir "${DESTDIR}"
129CONFIGURE_ARGS+= --prefix "${PREFIX}" 126CONFIGURE_ARGS+= --prefix "${PREFIX}"
130# Force use of native code compiler according to setting 127# Force use of native code compiler according to setting
131.if ${OCAML_USE_OPT_COMPILER} == "yes" 128.if ${OCAML_USE_OPT_COMPILER} == "yes"
132CONFIGURE_ARGS+= --override is_native true 129CONFIGURE_ARGS+= --override is_native true
133.else 130.else
134CONFIGURE_ARGS+= --override is_native false 131CONFIGURE_ARGS+= --override is_native false
135.endif 132.endif
136.endif 133.endif
137 134
 135# Configure stuff for JBUILDER
 136.if ${OCAML_USE_JBUILDER} == "yes"
 137.include "../../devel/ocaml-jbuilder/buildlink3.mk"
 138OCAML_USE_OPAM?= yes
 139.else
 140OCAML_USE_OPAM?= no
 141.endif
 142
138# Configure stuff for OPAM 143# Configure stuff for OPAM
139.if ${OCAML_USE_OPAM} == "yes" 144.if ${OCAML_USE_OPAM} == "yes"
140.include "../../misc/ocaml-opam/buildlink3.mk" 145.include "../../misc/ocaml-opam/buildlink3.mk"
141.endif 146.endif
142 147
143# Configure stuff for TOPKG 148# Configure stuff for TOPKG
144.if ${OCAML_USE_TOPKG} == "yes" 149.if ${OCAML_USE_TOPKG} == "yes"
145.include "../../misc/ocaml-topkg/buildlink3.mk" 150.include "../../misc/ocaml-topkg/buildlink3.mk"
146OCAML_USE_FINDLIB= yes 151OCAML_USE_FINDLIB= yes
147INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/${OCAML_TOPKG_NAME} 152INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/${OCAML_TOPKG_NAME}
148.endif 153.endif
149 154
150# Configure stuff for JBUILDER 
151.if ${OCAML_USE_JBUILDER} == "yes" 
152.include "../../devel/ocaml-jbuilder/buildlink3.mk" 
153OCAML_USE_OPAM?= yes 
154.endif 
155 
156# Value for OCAML_SITELIBDIR 155# Value for OCAML_SITELIBDIR
157OCAML_SITELIBDIR= lib/ocaml/site-lib 156OCAML_SITELIBDIR= lib/ocaml/site-lib
158MAKE_ENV+= OCAML_SITELIBDIR="${OCAML_SITELIBDIR}" 157MAKE_ENV+= OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
159PLIST_SUBST+= OCAML_SITELIB="${OCAML_SITELIBDIR}" 158PLIST_SUBST+= OCAML_SITELIB="${OCAML_SITELIBDIR}"
160 159
161PRINT_PLIST_AWK+= { gsub(/${OCAML_SITELIBDIR:S|/|\\/|g}/, \ 160PRINT_PLIST_AWK+= { gsub(/${OCAML_SITELIBDIR:S|/|\\/|g}/, \
162 "$${OCAML_SITELIB}"); \ 161 "$${OCAML_SITELIB}"); \
163 print; next; } 162 print; next; }
164 163
165.if ${OCAML_USE_FINDLIB} == "yes" 164.if ${OCAML_USE_FINDLIB} == "yes"
166.include "../../devel/ocaml-findlib/buildlink3.mk" 165.include "../../devel/ocaml-findlib/buildlink3.mk"
167INSTALLATION_DIRS+= ${OCAML_SITELIBDIR} 166INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}
168OCAML_FINDLIB_DIRS?= ${PKGBASE:S/^ocaml-//} 167OCAML_FINDLIB_DIRS?= ${PKGBASE:S/^ocaml-//}