From 40a9c2f9c091bdc0f04a60cac6d7c273fdc78870 Mon Sep 17 00:00:00 2001 From: Simon Branford <4967+branfosj@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:59:43 +0100 Subject: [PATCH 1/2] change extra path for OCaml --- easybuild/easyblocks/o/ocaml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyblocks/o/ocaml.py b/easybuild/easyblocks/o/ocaml.py index 875a0583ac1..5ea6677cad7 100644 --- a/easybuild/easyblocks/o/ocaml.py +++ b/easybuild/easyblocks/o/ocaml.py @@ -160,7 +160,7 @@ def make_module_req_guess(self): guesses.update({ 'CAML_LD_LIBRARY_PATH': ['lib'], 'OPAMROOT': [OPAM_SUBDIR], - 'PATH': ['bin', os.path.join(OPAM_SUBDIR, 'system', 'bin')], + 'PATH': ['bin', os.path.join(OPAM_SUBDIR, 'default', 'bin')], }) return guesses From bc7fa886608f935f3604baecc4b02e6a4799ab90 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Wed, 31 Jul 2024 16:10:15 +0100 Subject: [PATCH 2/2] enhance sanity check --- easybuild/easyblocks/o/ocaml.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/easybuild/easyblocks/o/ocaml.py b/easybuild/easyblocks/o/ocaml.py index 5ea6677cad7..eb3f37816fc 100644 --- a/easybuild/easyblocks/o/ocaml.py +++ b/easybuild/easyblocks/o/ocaml.py @@ -146,12 +146,21 @@ def sanity_check_step(self): binaries.append('bin/opam') dirs.append(OPAM_SUBDIR) + extension_names = [ext_name for ext_name, _ in self.cfg['exts_list']] + + custom_commands = ["ocaml --help"] + if 'ocamlfind' in extension_names: + custom_commands.append("ocamlfind list") + + if 'dune' in extension_names: + custom_commands.append("dune --version") + custom_paths = { 'files': binaries, 'dirs': dirs, } - super(EB_OCaml, self).sanity_check_step(custom_paths=custom_paths) + super(EB_OCaml, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands) def make_module_req_guess(self): """Custom extra paths/variables to define in generated module for OCaml."""