GNU bug report logs -
#40399
[PATCH] build-system/gnu: Allow overriding of bootstrap scripts.
Previous Next
Reported by: Ricardo Wurmus <rekado <at> elephly.net>
Date: Fri, 3 Apr 2020 05:13:02 UTC
Severity: normal
Tags: patch
Done: Ricardo Wurmus <rekado <at> elephly.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40399 in the body.
You can then email your comments to 40399 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#40399
; Package
guix-patches
.
(Fri, 03 Apr 2020 05:13:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Ricardo Wurmus <rekado <at> elephly.net>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Fri, 03 Apr 2020 05:13:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* 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.
---
guix/build-system/gnu.scm | 8 ++++++++
guix/build/gnu-build-system.scm | 6 +-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 7266fa0009..f28d59cc5e 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -322,10 +322,15 @@ standard packages used as implicit inputs of the GNU build system."
;; Regexp matching license files.
"^(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
#:key (guile #f)
(outputs '("out"))
(search-paths '())
+ (bootstrap-scripts %bootstrap-scripts)
(configure-flags ''())
(make-flags ''())
(out-of-source? #f)
@@ -398,6 +403,7 @@ packages that must not be referenced."
search-paths)
#:phases ,phases
#:locale ,locale
+ #:bootstrap-scripts ,bootstrap-scripts
#:configure-flags ,configure-flags
#:make-flags ,make-flags
#:out-of-source? ,out-of-source?
@@ -476,6 +482,7 @@ is one of `host' or `target'."
(search-paths '())
(native-search-paths '())
+ (bootstrap-scripts %bootstrap-scripts)
(configure-flags ''())
(make-flags ''())
(out-of-source? #f)
@@ -557,6 +564,7 @@ platform."
native-search-paths)
#:phases ,phases
#:locale ,locale
+ #:bootstrap-scripts ,bootstrap-scripts
#:configure-flags ,configure-flags
#:make-flags ,make-flags
#:out-of-source? ,out-of-source?
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 4df0bb4904..72a188955d 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -163,11 +163,7 @@ working directory."
(chdir (first-subdirectory "."))))
#t)
-(define %bootstrap-scripts
- ;; Typical names of Autotools "bootstrap" scripts.
- '("bootstrap" "bootstrap.sh" "autogen.sh"))
-
-(define* (bootstrap #:key (bootstrap-scripts %bootstrap-scripts)
+(define* (bootstrap #:key bootstrap-scripts
#:allow-other-keys)
"If the code uses Autotools and \"configure\" is missing, run
\"autoreconf\". Otherwise do nothing."
--
2.25.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#40399
; Package
guix-patches
.
(Sat, 04 Apr 2020 19:41:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 40399 <at> debbugs.gnu.org (full text, mbox):
Ricardo Wurmus <rekado <at> elephly.net> writes:
> * 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.
This is for the next core-updates branch.
--
Ricardo
Information forwarded
to
guix-patches <at> gnu.org
:
bug#40399
; Package
guix-patches
.
(Fri, 18 Dec 2020 11:20:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 40399 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Ricardo Wurmus <rekado <at> elephly.net> writes:
> Ricardo Wurmus <rekado <at> elephly.net> writes:
>
>> * 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.
>
> This is for the next core-updates branch.
This looks reasonable to me, I believe now is a good time to push to
core-updates as well.
Thanks,
Chris
[signature.asc (application/pgp-signature, inline)]
Reply sent
to
Ricardo Wurmus <rekado <at> elephly.net>
:
You have taken responsibility.
(Wed, 23 Dec 2020 12:37:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Ricardo Wurmus <rekado <at> elephly.net>
:
bug acknowledged by developer.
(Wed, 23 Dec 2020 12:37:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 40399-done <at> debbugs.gnu.org (full text, mbox):
Christopher Baines <mail <at> cbaines.net> writes:
> Ricardo Wurmus <rekado <at> elephly.net> writes:
>
>> Ricardo Wurmus <rekado <at> elephly.net> writes:
>>
>>> * 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.
>>
>> This is for the next core-updates branch.
>
> This looks reasonable to me, I believe now is a good time to push to
> core-updates as well.
Thanks for the review.
I pushed it to core-updates.
--
Ricardo
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Thu, 21 Jan 2021 12:24:07 GMT)
Full text and
rfc822 format available.
This bug report was last modified 3 years and 67 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.