From 660bbacbdfa5f3c8c1243d8fca8ae60bcb7161f6 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Wed, 20 Mar 2024 19:34:30 +0200 Subject: [PATCH] r-*: improve Fortran dependency detection - remove ".for" from the Fortran suffixes - add ".f95" to the Fortran suffixes - search only files in the `src` directory --- lilac-extensions/lilac_r_utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index e7ba7ed51f..89e85ab119 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -317,8 +317,11 @@ def check_optdepends(pkg: Pkgbuild, desc: Description, cfg: CheckConfig): def check_fortran(pkg: Pkgbuild, desc: Description, cfg: CheckConfig): fortran_files = False + prefix = f"{pkg._pkgname}/src/" + # accepted Fortran file suffixes are listed in `/etc/R/Makeconf` + suffixes = (".f", ".f90", ".f95") for name in cfg.tar.getnames(): - if name.endswith(".f") or name.endswith(".f90") or name.endswith(".for"): + if name.startswith(prefix) and name.endswith(suffixes): fortran_files = True break fortran_dep = "gcc-fortran" in pkg.makedepends