소스 검색

finetune logoutput

Waldemar Brodkorb 8 년 전
부모
커밋
d21baa0388
4개의 변경된 파일13개의 추가작업 그리고 11개의 파일을 삭제
  1. 3 3
      mk/fetch.mk
  2. 5 3
      mk/host-bottom.mk
  3. 4 4
      mk/pkg-bottom.mk
  4. 1 1
      package/Makefile

+ 3 - 3
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; \

+ 5 - 3
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

+ 4 - 4
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

+ 1 - 1
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,%,$@) ; \