From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [PATCH 07/13] build: Add 'DL' silent rule. Date: Sun, 24 Jan 2016 21:19:25 +0100 Message-ID: <1453666771-16869-8-git-send-email-mthl@gnu.org> References: <1453666771-16869-1-git-send-email-mthl@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.7.0.rc3" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNR97-0003aC-Uo for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNR96-0005ck-HV for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:25 -0500 In-Reply-To: <1453666771-16869-1-git-send-email-mthl@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.7.0.rc3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable * 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= ). --- Makefile.am | 10 ++++++++++ gnu-system.am | 21 +++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) --------------2.7.0.rc3 Content-Type: text/x-patch; name="0007-build-Add-DL-silent-rule.patch" Content-Disposition: inline; filename="0007-build-Add-DL-silent-rule.patch" Content-Transfer-Encoding: quoted-printable diff --git a/Makefile.am b/Makefile.am index 1ede6d4..754c19a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ # Copyright =C2=A9 2012, 2013, 2014, 2015, 2016 Ludovic Court=C3=A8s # Copyright =C2=A9 2013 Andreas Enge # Copyright =C2=A9 2015 Alex Kost +# Copyright =C2=A9 2016 Mathieu Lirzin # # This file is part of GNU Guix. # @@ -471,3 +472,12 @@ 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 =3D $(AM_V_DL_$(V)) +AM_V_DL_ =3D $(AM_V_DL_$(AM_DEFAULT_VERBOSITY)) +AM_V_DL_0 =3D @echo " DL " $@; + diff --git a/gnu-system.am b/gnu-system.am index 3426056..a3d43e1 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright =C2=A9 2012, 2013, 2014, 2015 Ludovic Court=C3=A8s # Copyright =C2=A9 2013, 2014, 2015, 2016 Andreas Enge +# Copyright =C2=A9 2016 Mathieu Lirzin # Copyright =C2=A9 2013, 2014, 2015, 2016 Mark H Weaver # # This file is part of GNU Guix. @@ -808,14 +809,18 @@ DOWNLOAD_FILE =3D \ "$(top_srcdir)/build-aux/download.scm" =20 gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz: - $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70= b4ffd397fd2f57f0" + $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \ + $(AM_V_P) && fd=3D1 || fd=3D- ; $(DOWNLOAD_FILE) "$@" \ + "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0" >&= $$fd gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz: - $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb= 816f29302a00a846" + $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \ + $(AM_V_P) && fd=3D1 || fd=3D- ; $(DOWNLOAD_FILE) "$@" \ + "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846" >&= $$fd gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz: - $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06= e70a157a685e23d6" + $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \ + $(AM_V_P) && fd=3D1 || fd=3D- ; $(DOWNLOAD_FILE) "$@" \ + "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6" >&= $$fd gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz: - $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "994680f0001346864aa2c2cc5110f380ee7518dcd701c614= 291682b8e948f73b" + $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \ + $(AM_V_P) && fd=3D1 || fd=3D- ; $(DOWNLOAD_FILE) "$@" \ + "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b" >&= $$fd --------------2.7.0.rc3--