From f46630aa30d4c9f6a7700913bfab10fcf17c09f65d892c6ac7504d5774799502 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 28 Jan 2021 00:06:41 +0000 Subject: [PATCH] - Run dune installed-libraries also in ocaml_dune_test OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=51 --- ocaml-rpm-macros.changes | 3 ++- ocaml-rpm-macros.spec | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ocaml-rpm-macros.changes b/ocaml-rpm-macros.changes index 2f1f01c..0742dc5 100644 --- a/ocaml-rpm-macros.changes +++ b/ocaml-rpm-macros.changes @@ -5,7 +5,8 @@ Thu Jan 21 21:21:21 UTC 2021 - ohering@suse.de Take negative predicates in requires() into account, and ignore them. This is supposed to avoid dependency cycles due to excessive list of dependencies. - +- Run dune installed-libraries also in ocaml_dune_test + ------------------------------------------------------------------- Thu Jan 14 14:14:14 UTC 2021 - ohering@suse.de diff --git a/ocaml-rpm-macros.spec b/ocaml-rpm-macros.spec index f0389f7..1b53779 100644 --- a/ocaml-rpm-macros.spec +++ b/ocaml-rpm-macros.spec @@ -507,6 +507,11 @@ ocaml setup.ml -configure \\\ read dune_release_pkgs < dune_release_pkgs-%%{name}-%%{version}-%%{release} ; \ dune_for_release="--for-release-of-packages=${dune_release_pkgs}" ; \ fi ; \ + dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \ + dune external-lib-deps \\\ + ${dune_for_release} \\\ + '@runtest' \\\ + $OCAML_DUNE_EXTERNAL_LIB_DEPS_ARGS ; \ if dune runtest \\\ --verbose \\\ ${dune_for_release} \\\