aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2016-01-24 18:48:29 +0100
committerMathieu Lirzin <mthl@gnu.org>2016-01-28 16:31:38 +0100
commit8c3d8894562ac990e7b5f23e74e6f12ea14b1a87 (patch)
treeaa07b8cfe3a6c1b8e900ece4b2d4984955b5c660
parent74e667d14912b9243043b43995848d962569a9a1 (diff)
downloadguix-8c3d8894562ac990e7b5f23e74e6f12ea14b1a87.tar
guix-8c3d8894562ac990e7b5f23e74e6f12ea14b1a87.tar.gz
build: Add 'DL' silent rule.
* Makefile.am (AM_V_DL, AM_V_DL_, AM_V_DL_0): New variables. * gnu-system.am (gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz) (gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz) (gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz) (gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz): Use $(AM_V_DL). * build-aux/download.scm: Print a line break between target and origin.
-rw-r--r--Makefile.am9
-rw-r--r--build-aux/download.scm2
-rw-r--r--gnu-system.am21
3 files changed, 23 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 1ede6d4057..4e97ff18d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@
# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
# Copyright © 2015 Alex Kost <alezost@gmail.com>
+# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -471,3 +472,11 @@ assert-final-inputs-self-contained:
.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
.PHONY: assert-no-store-file-names assert-binaries-available
.PHONY: assert-final-inputs-self-contained
+
+## -------------- ##
+## Silent rules. ##
+## -------------- ##
+
+AM_V_DL = $(AM_V_DL_$(V))
+AM_V_DL_ = $(AM_V_DL_$(AM_DEFAULT_VERBOSITY))
+AM_V_DL_0 = @echo " DL " $@;
diff --git a/build-aux/download.scm b/build-aux/download.scm
index a107a887dc..1e91e4b87c 100644
--- a/build-aux/download.scm
+++ b/build-aux/download.scm
@@ -56,7 +56,7 @@
(match (command-line)
((_ file expected-hash)
(let ((uri (file-name->uri file)))
- (format #t "downloading file `~a' from `~a'...~%"
+ (format #t "downloading file `~a'~%from `~a'...~%"
file (uri->string uri))
(let*-values (((resp data) (http-get uri #:decode-body? #f))
((hash) (bytevector->base16-string (sha256 data)))
diff --git a/gnu-system.am b/gnu-system.am
index ac386355df..19f7ca77ac 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -1,6 +1,7 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
+# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
#
# This file is part of GNU Guix.
@@ -834,14 +835,18 @@ DOWNLOAD_FILE = \
"$(top_srcdir)/build-aux/download.scm"
gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@" "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@" "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@" "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@" "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"