X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=include%2Fprereq.mk;h=33ac27823297b0ab86d98013aaeb8fc3f53321a7;hp=d3b73663e34a16bef37e17e2ec31b4a3e5ee0e5d;hb=19ac39e650f4d0a2506d5841babd9978940ce2c8;hpb=192a8740b3e804ad08ba7700bf0731dcd742550d diff --git a/include/prereq.mk b/include/prereq.mk index d3b73663e3..33ac278232 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -30,12 +30,12 @@ define Require prereq: prereq-$(1) prereq-$(1): $(if $(PREREQ_PREV),prereq-$(PREREQ_PREV)) FORCE - echo -n "Checking '$(1)'... " + printf "Checking '$(1)'... " if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \ echo 'ok.'; \ else \ echo 'failed.'; \ - echo -e "$(PKG_NAME): $(strip $(2))" | perl -ne 's/\\\s*/\n/g,print' >> $(TMP_DIR)/.prereq-error; \ + echo "$(PKG_NAME): $(strip $(2))" >> $(TMP_DIR)/.prereq-error; \ fi check-$(1): FORCE @@ -62,7 +62,7 @@ define RequireHeader define Require/$(1) [ -e "$(1)" ] endef - + $$(eval $$(call Require,$(1),$(2))) endef @@ -88,7 +88,8 @@ define SetupHostCommand define Require/$(1) for cmd in $(call QuoteHostCommand,$(3)) $(call QuoteHostCommand,$(4)) \ $(call QuoteHostCommand,$(5)) $(call QuoteHostCommand,$(6)) \ - $(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)); do \ + $(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)) \ + $(call QuoteHostCommand,$(9)); do \ if [ -n "$$$$$$$$cmd" ]; then \ bin="$$$$$$$$(PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))" \ which "$$$$$$$${cmd%% *}")"; \