diff options
| author | jaapb <jaapb@pkgsrc.org> | 2022-05-19 08:22:33 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2022-05-19 08:22:33 +0000 |
| commit | bc1ae25a482bf3529177fcc9b7bfd931b7e1db57 (patch) | |
| tree | 462b27f5894761a27281e2b828ac0847fc869988 | |
| parent | 975fe39d6d5c470f06c461184ccefa6df8c95400 (diff) | |
| download | pkgsrc-bc1ae25a482bf3529177fcc9b7bfd931b7e1db57.tar.gz | |
Fixed build problem in textproc/ocaml-csv, revbump.
There was a problem with modules not being built correctly according to
options set; I've now corrected this. Thanks to mef@ for reporting this.
| -rw-r--r-- | textproc/ocaml-csv/Makefile | 8 | ||||
| -rw-r--r-- | textproc/ocaml-csv/buildlink3.mk | 4 | ||||
| -rw-r--r-- | textproc/ocaml-csv/options.mk | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/textproc/ocaml-csv/Makefile b/textproc/ocaml-csv/Makefile index 23b8f47f128..5ebf0798495 100644 --- a/textproc/ocaml-csv/Makefile +++ b/textproc/ocaml-csv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2022/05/05 12:00:47 jaapb Exp $ +# $NetBSD: Makefile,v 1.26 2022/05/19 08:22:33 jaapb Exp $ VERSION= 2.4 +PKGREVISION= 1 GITHUB_PROJECT= ocaml-csv DISTNAME= ${GITHUB_PROJECT}-${VERSION} CATEGORIES= textproc @@ -15,8 +16,9 @@ LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= c OCAML_USE_DUNE= yes -OPAM_INSTALL_FILES= csv -OCAML_FINDLIB_DIRS= csv +DUNE_BUILD_PACKAGES= csv +OPAM_INSTALL_FILES= ${DUNE_BUILD_PACKAGES} +OCAML_FINDLIB_DIRS= ${DUNE_BUILD_PACKAGES} .include "options.mk" .include "../../mk/ocaml.mk" diff --git a/textproc/ocaml-csv/buildlink3.mk b/textproc/ocaml-csv/buildlink3.mk index 763ce90df44..e6319c69f97 100644 --- a/textproc/ocaml-csv/buildlink3.mk +++ b/textproc/ocaml-csv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2022/05/05 12:00:47 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2022/05/19 08:22:33 jaapb Exp $ BUILDLINK_TREE+= ocaml-csv @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-csv OCAML_CSV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-csv+= ocaml-csv>=2.0 -BUILDLINK_ABI_DEPENDS.ocaml-csv+= ocaml-csv>=2.4 +BUILDLINK_ABI_DEPENDS.ocaml-csv+= ocaml-csv>=2.4nb1 BUILDLINK_PKGSRCDIR.ocaml-csv?= ../../textproc/ocaml-csv .endif # OCAML_CSV_BUILDLINK3_MK diff --git a/textproc/ocaml-csv/options.mk b/textproc/ocaml-csv/options.mk index 8bab33b523f..17385452f2d 100644 --- a/textproc/ocaml-csv/options.mk +++ b/textproc/ocaml-csv/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2022/05/05 12:00:47 jaapb Exp $ +# $NetBSD: options.mk,v 1.5 2022/05/19 08:22:33 jaapb Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml-csv PKG_SUPPORTED_OPTIONS= lwt @@ -10,11 +10,12 @@ PLIST_VARS+= lwt .include "../../mk/bsd.options.mk" ### -### Camlp4 support +### Lwt support ### .if !empty(PKG_OPTIONS:Mlwt) .include "../../devel/ocaml-lwt/buildlink3.mk" PLIST.lwt= yes +DUNE_BUILD_PACKAGES+= csv-lwt OPAM_INSTALL_FILES+= csv-lwt OCAML_FINDLIB_DIRS+= csv-lwt .else |