diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-04-05 18:42:07 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-05-16 21:43:15 +0200 |
| commit | a0f43208cb424306a79fa74690b0f2075c7c35b2 (patch) | |
| tree | 0c0405e8c5c6b10fff0f5b5f2302cb326a5c22d8 /guix/import | |
| parent | ff8c179ab63a818a1b6bb96c46ffde861a7312e8 (diff) | |
| download | gnu-guix-a0f43208cb424306a79fa74690b0f2075c7c35b2.tar gnu-guix-a0f43208cb424306a79fa74690b0f2075c7c35b2.tar.gz | |
import cran: Refactor "needs-zlib?".
* guix/import/cran.scm (tarball-files-match-pattern?): New procedure.
(needs-zlib?): Implement in terms of "tarball-files-match-pattern?".
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/cran.scm | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 039f3524fc..db72feba80 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -207,17 +207,16 @@ empty list when the FIELD cannot be found." (check "*.f95") (check "*.f"))) -(define (needs-zlib? tarball) - "Return #T if any of the Makevars files in the src directory of the TARBALL -contain a zlib linker flag." +(define (tarball-files-match-pattern? tarball regexp . file-patterns) + "Return #T if any of the files represented by FILE-PATTERNS in the TARBALL +match the given REGEXP." (call-with-temporary-directory (lambda (dir) - (let ((pattern (make-regexp "-lz"))) + (let ((pattern (make-regexp regexp))) (parameterize ((current-error-port (%make-void-port "rw+"))) - (system* "tar" - "xf" tarball "-C" dir - "--wildcards" - "*/src/Makevars*" "*/src/configure*" "*/configure*")) + (apply system* "tar" + "xf" tarball "-C" dir + `("--wildcards" ,@file-patterns))) (any (lambda (file) (call-with-input-file file (lambda (port) @@ -226,10 +225,16 @@ contain a zlib linker flag." (cond ((eof-object? line) #f) ((regexp-exec pattern line) #t) - (else (loop))))))) - #t) + (else (loop)))))))) (find-files dir)))))) +(define (needs-zlib? tarball) + "Return #T if any of the Makevars files in the src directory of the TARBALL +contain a zlib linker flag." + (tarball-files-match-pattern? + tarball "-lz" + "*/src/Makevars*" "*/src/configure*" "*/configure*")) + (define (description->package repository meta) "Return the `package' s-expression for an R package published on REPOSITORY from the alist META, which was derived from the R package's DESCRIPTION file." |