mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
build-system/gnu: Do not patch symlinks in the source.
This is a followup to 13a9feb5b64fd819eaed38a17da0284bbe2b8d9. * guix/build/gnu-build-system.scm (patch-source-shebangs): Remove call to 'remove'. Pass a second argument to 'find-files' to filter out symlinks; pass #:stat lstat. (patch-generated-file-shebangs): Likewise, and also filter out non-executable files.
This commit is contained in:
parent
e7e43727ce
commit
5c9632c75a
1 changed files with 12 additions and 11 deletions
|
@ -172,22 +172,23 @@ (define* (patch-source-shebangs #:key source #:allow-other-keys)
|
|||
$CONFIG_SHELL, but some don't, such as `mkinstalldirs' or Automake's
|
||||
`missing' script."
|
||||
(for-each patch-shebang
|
||||
(remove (lambda (file)
|
||||
(or (not (file-exists? file)) ;dangling symlink
|
||||
(file-is-directory? file)))
|
||||
(find-files "."))))
|
||||
(find-files "."
|
||||
(lambda (file stat)
|
||||
;; Filter out symlinks.
|
||||
(eq? 'regular (stat:type stat)))
|
||||
#:stat lstat)))
|
||||
|
||||
(define (patch-generated-file-shebangs . rest)
|
||||
"Patch shebangs in generated files, including `SHELL' variables in
|
||||
makefiles."
|
||||
;; Patch executable files, some of which might have been generated by
|
||||
;; `configure'.
|
||||
;; Patch executable regular files, some of which might have been generated
|
||||
;; by `configure'.
|
||||
(for-each patch-shebang
|
||||
(filter (lambda (file)
|
||||
(and (file-exists? file)
|
||||
(executable-file? file)
|
||||
(not (file-is-directory? file))))
|
||||
(find-files ".")))
|
||||
(find-files "."
|
||||
(lambda (file stat)
|
||||
(and (eq? 'regular (stat:type stat))
|
||||
(not (zero? (logand (stat:mode stat) #o100)))))
|
||||
#:stat lstat))
|
||||
|
||||
;; Patch `SHELL' in generated makefiles.
|
||||
(for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$")))
|
||||
|
|
Loading…
Reference in a new issue