me
/
guix
Archived
1
0
Fork 0
Code

build-system/gnu: Allow overriding of bootstrap scripts. 

* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Accept
bootstrap-scripts keyword argument and pass it to gnu-build.
(%bootstrap-scripts): New variable.
* guix/build/gnu-build-system.scm (%bootstrap-scripts): Remove variable.
(bootstrap): Remove default value for bootstrap-scripts argument.
master
Ricardo Wurmus 2020-04-03 07:11:33 +02:00
parent 40f14e3c66
commit 9cfc93be30
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/build-system/gnu.scm
View File

@ -324,10 +324,15 @@ standard packages used as implicit inputs of the GNU build system."
;; Regexp matching license files. ;; Regexp matching license files.
"^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$") "^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$")
(define %bootstrap-scripts
;; Typical names of Autotools "bootstrap" scripts.
'("bootstrap" "bootstrap.sh" "autogen.sh"))
(define* (gnu-build store name input-drvs (define* (gnu-build store name input-drvs
#:key (guile #f) #:key (guile #f)
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(bootstrap-scripts %bootstrap-scripts)
(configure-flags ''()) (configure-flags ''())
(make-flags ''()) (make-flags ''())
(out-of-source? #f) (out-of-source? #f)
@ -401,6 +406,7 @@ packages that must not be referenced."
search-paths) search-paths)
#:phases ,phases #:phases ,phases
#:locale ,locale #:locale ,locale
#:bootstrap-scripts ,bootstrap-scripts
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:make-flags ,make-flags #:make-flags ,make-flags
#:out-of-source? ,out-of-source? #:out-of-source? ,out-of-source?
@ -486,6 +492,7 @@ is one of `host' or `target'."
(search-paths '()) (search-paths '())
(native-search-paths '()) (native-search-paths '())
(bootstrap-scripts %bootstrap-scripts)
(configure-flags ''()) (configure-flags ''())
(make-flags ''()) (make-flags ''())
(out-of-source? #f) (out-of-source? #f)
@ -570,6 +577,7 @@ platform."
native-search-paths) native-search-paths)
#:phases ,phases #:phases ,phases
#:locale ,locale #:locale ,locale
#:bootstrap-scripts ,bootstrap-scripts
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:make-flags ,make-flags #:make-flags ,make-flags
#:out-of-source? ,out-of-source? #:out-of-source? ,out-of-source?

6
guix/build/gnu-build-system.scm
View File

@ -160,11 +160,7 @@ working directory."
(invoke "tar" "xvf" source)) (invoke "tar" "xvf" source))
(chdir (first-subdirectory "."))))) (chdir (first-subdirectory ".")))))
(define %bootstrap-scripts (define* (bootstrap #:key bootstrap-scripts
;; Typical names of Autotools "bootstrap" scripts.
'("bootstrap" "bootstrap.sh" "autogen.sh"))
(define* (bootstrap #:key (bootstrap-scripts %bootstrap-scripts)
#:allow-other-keys) #:allow-other-keys)
"If the code uses Autotools and \"configure\" is missing, run "If the code uses Autotools and \"configure\" is missing, run
\"autoreconf\". Otherwise do nothing." \"autoreconf\". Otherwise do nothing."