01/26: import/cran: Also search Makevars file for libraries.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 67183e25ada01ec8125f5784c27fc3d098f7c0f0
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Jun 2 12:48:42 2023 +0200

    import/cran: Also search Makevars file for libraries.
    
    * guix/import/cran.scm (needed-libraries-in-directory): Look at Makevars in
    addition to Makevars.in for libraries.
---
 guix/import/cran.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index d25f334396..bec2010cc5 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -503,7 +503,7 @@ referenced in build system files."
                        packages
                        (list-matches libraries-pattern line))))))))))
     (set)
-    (find-files dir "(Makevars.in*|configure.*)"))))
+    (find-files dir "(Makevars(.in.*)?|configure.*)"))))
 
 (define (directory-needs-pkg-config? dir)
   "Return #T if any of the Makevars files in the src directory DIR reference