From d21baa0388fd75619f900fc5694fa7dc3819102a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Sep 2016 06:17:58 +0200 Subject: finetune logoutput --- mk/fetch.mk | 6 +++--- mk/host-bottom.mk | 8 +++++--- mk/pkg-bottom.mk | 8 ++++---- package/Makefile | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mk/fetch.mk b/mk/fetch.mk index 743626378..200f3f785 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -67,11 +67,11 @@ $(1): if [ ! -z "$${PKG_GIT}" ]; then \ case "$${PKG_GIT}" in \ tag|branch) \ - echo "Using git tag/branch: $${PKG_VERSION}"; \ + echo "Using git tag/branch: $${PKG_VERSION}" $(DL_TRACE); \ git clone --depth 1 --branch $${PKG_VERSION} $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION}; \ ;; \ hash) \ - echo "Using git hash: $${PKG_VERSION}"; \ + echo "Using git hash: $${PKG_VERSION}" $(DL_TRACE); \ git clone $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION}; \ (cd $${PKG_NAME}-$${PKG_VERSION}; git checkout $(GITOPTS) $${PKG_VERSION}); \ ;; \ @@ -87,7 +87,7 @@ $(1): ;; \ http://*|https://*|ftp://*) \ for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \ - : echo "$${FETCHCMD} $$$$site$$$$filename"; \ + echo "$${FETCHCMD} $$$$site$$$$filename" $(DL_TRACE); \ rm -f "$$$$filename"; \ if $${FETCHCMD} $$$$filename $$$$site$$$$filename $(DL_TRACE); then \ : check the size here; \ diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index bc1b7a631..8af7de253 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -7,9 +7,8 @@ hostpre-configure: host-configure: ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} mkdir -p ${WRKBUILD} - @$(CMD_TRACE) "configuring.. " ifneq (,$(filter autogen,${AUTOTOOL_STYLE})) - @$(CMD_TRACE) "autotool configuring.. " + @$(CMD_TRACE) "autotooling.. " @cd ${WRKSRC}; env ${AUTOTOOL_ENV} $(BASH) autogen.sh $(MAKE_TRACE) endif ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) @@ -19,6 +18,7 @@ ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) endif @${MAKE} hostpre-configure $(MAKE_TRACE) ifeq (${HOST_STYLE},) + @$(CMD_TRACE) "configuring.. " cd ${WRKBUILD}; \ env ${HOST_CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ @@ -32,6 +32,7 @@ ifeq (${HOST_STYLE},) ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) endif ifeq (${HOST_STYLE},auto) + @$(CMD_TRACE) "configuring.. " cd ${WRKBUILD}; \ env ${HOST_CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ @@ -51,6 +52,7 @@ ifeq (${HOST_STYLE},auto) ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) endif ifeq (${HOST_STYLE},manual) + @$(CMD_TRACE) "configuring.. " ${MAKE} host-configure $(MAKE_TRACE) endif ifeq (${HOST_STYLE},perl) @@ -66,8 +68,8 @@ endif host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} -ifneq (${HOST_STYLE},manual) @$(CMD_TRACE) "compiling.. " +ifneq (${HOST_STYLE},manual) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) endif diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index a519c7a22..3f51fc7be 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -24,19 +24,19 @@ do-configure: post-configure: ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} ifneq (,$(filter bootstrap,${AUTOTOOL_STYLE})) - @$(CMD_TRACE) "autotool configuring.. " + @$(CMD_TRACE) "autotooling.. " @cd ${WRKSRC}; env ${AUTOTOOL_ENV} $(BASH) bootstrap* $(MAKE_TRACE) endif ifneq (,$(filter autogen,${AUTOTOOL_STYLE})) - @$(CMD_TRACE) "autotool configuring.. " + @$(CMD_TRACE) "autotooling.. " @cd ${WRKSRC}; env ${AUTOTOOL_ENV} $(BASH) autogen.sh $(MAKE_TRACE) endif ifneq (,$(filter autoconf,${AUTOTOOL_STYLE})) - @$(CMD_TRACE) "autotool configuring.. " + @$(CMD_TRACE) "autotooling.. " @cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoconf $(MAKE_TRACE) endif ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) - @$(CMD_TRACE) "autotool configuring.. " + @$(CMD_TRACE) "autotooling.. " @cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -vif $(MAKE_TRACE) @rm -rf ${WRKSRC}/autom4te.cache @touch ${WRKDIR}/.autoreconf_done diff --git a/package/Makefile b/package/Makefile index c7779c2ac..8862560eb 100644 --- a/package/Makefile +++ b/package/Makefile @@ -62,7 +62,7 @@ endif $(END_TRACE) %-compile: - $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile.. " + $(START_TRACE) "package/$(patsubst %-compile,%,$@).. " @if test -f $(ADK_TOPDIR)/.rebuild.$(patsubst %-compile,%,$@); then \ $(MAKE) -C $(patsubst %-compile,%,$@) clean ; \ rm $(ADK_TOPDIR)/.rebuild.$(patsubst %-compile,%,$@) ; \ -- cgit v1.2.3