[Xen-changelog] [xen staging] tools: Once again honour, but no longer advertise GIT_HTTP env var

[patchbot@xxxxxxx]

commit 83335e987c8d546e975883f391e6f37d89f45e36
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Mon Nov 5 18:37:05 2018 +0000
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Tue Nov 6 12:15:05 2018 +0000

    tools: Once again honour, but no longer advertise GIT_HTTP env var
    
    In "build: add autoconf to replace custom checks in tools/check"
    --enable-githttp was introduced.  But we missed this comment where it
    was advertised.
    
    Also, that commit had the effect of uncondtionally setting GIT_HTTP
    from the configure variable.  But the env var has been advertised in
    some places as the way to specify this behaviour, and overriding it is
    just unfriendly.
    
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    CC: Paul Durrant <paul.durrant@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 config/Tools.mk.in    | 4 ++--
 config/Toplevel.mk.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 1e5cc20bf7..98245f63c9 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -40,8 +40,8 @@ XEN_TOOLS_RPATH     := @rpath@
 # Download GIT repositories via HTTP or GIT's own protocol?
 # GIT's protocol is faster and more robust, when it works at all (firewalls
 # may block it). We make it the default, but if your GIT repository downloads
-# fail or hang, please specify GIT_HTTP=y in your environment.
-GIT_HTTP            := @githttp@
+# fail or hang, please pass --enable-githttp to configure.
+GIT_HTTP            ?= @githttp@
 
 # Optional components
 XENSTAT_XENTOP      := @monitors@
diff --git a/config/Toplevel.mk.in b/config/Toplevel.mk.in
index 1d991895ea..4ecacbb37d 100644
--- a/config/Toplevel.mk.in
+++ b/config/Toplevel.mk.in
@@ -1,2 +1,2 @@
 SUBSYSTEMS               := @SUBSYSTEMS@
-GIT_HTTP                 := @githttp@
+GIT_HTTP                 ?= @githttp@
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog