From 5844514e74eac69b71c1e1661676dd88e4450610 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 29 Oct 2015 19:34:24 -0700 Subject: Fix samples using GMP 4.3.2. Some older versions of configure (including the one in GMP 4.3.2) interpret the $ECHO environment variable as the `echo' utility to use. CT-NG sets the variable to `:' and exports it if V=0 or V=1 is supplied, breaking the samples using such configure. This currently includes bfin-unknown-linux-uclibc and powerpc-unknown-linux-uclibc. Also, correct the description of the V= variable - V=0 is *not* the default; in fact, default does not correspond to any of the V=[012] values. Signed-off-by: Alexey Neyman diff --git a/config/config.mk b/config/config.mk index 8cc2b15..669e157 100644 --- a/config/config.mk +++ b/config/config.mk @@ -50,12 +50,12 @@ config_files: $(STATIC_CONFIG_FILES) $(GEN_CONFIG_FILES) # Where to access to the source config files from config: - @$(ECHO) " LN config" + @$(CT_ECHO) " LN config" $(SILENT)ln -s $(CT_LIB_DIR)/config config # Where to store the generated config files into config.gen: - @$(ECHO) " MKDIR config.gen" + @$(CT_ECHO) " MKDIR config.gen" $(SILENT)mkdir -p config.gen #----------------------------------------------------------- @@ -74,34 +74,34 @@ DEBUGS = $(patsubst config/debug/%.in,%,$(DEBUG_CONFIG_FILES)) # WARNING! If a .in file disapears between two runs, that will NOT be detected! config.gen/arch.in: $(ARCH_CONFIG_FILES) $(ARCH_CONFIG_FILES_2) - @$(ECHO) ' IN $(@)' + @$(CT_ECHO) ' IN $(@)' $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "Target Architecture" "ARCH" "config/arch" "Y" $(ARCHS) config.gen/kernel.in: $(KERNEL_CONFIG_FILES) $(KERNEL_CONFIG_FILES_2) - @$(ECHO) ' IN $(@)' + @$(CT_ECHO) ' IN $(@)' $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "Target OS" "KERNEL" "config/kernel" "Y" $(KERNELS) config.gen/cc.in: $(CC_CONFIG_FILES) $(CC_CONFIG_FILES_2) - @$(ECHO) ' IN $(@)' + @$(CT_ECHO) ' IN $(@)' $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "C compiler" "CC" "config/cc" "N" $(CCS) config.gen/binutils.in: $(CC_BINUTILS_FILES) $(CC_BINUTILS_FILES_2) - @$(ECHO) ' IN $(@)' + @$(CT_ECHO) ' IN $(@)' $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "Binutils" "BINUTILS" "config/binutils" "N" $(BINUTILSS) config.gen/libc.in: $(LIBC_CONFIG_FILES) $(LIBC_CONFIG_FILES_2) - @$(ECHO) ' IN $(@)' + @$(CT_ECHO) ' IN $(@)' $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "C library" "LIBC" "config/libc" "Y" $(LIBCS) config.gen/debug.in: $(DEBUG_CONFIG_FILES) - @$(ECHO) ' IN $(@)' + @$(CT_ECHO) ' IN $(@)' $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh menu "$@" "Debug facilities" "DEBUG" "config/debug" $(DEBUGS) #----------------------------------------------------------- # Cleaning up the mess... clean:: - @$(ECHO) " CLEAN config" + @$(CT_ECHO) " CLEAN config" $(SILENT)rm -f config 2>/dev/null || true - @$(ECHO) " CLEAN config.gen" + @$(CT_ECHO) " CLEAN config.gen" $(SILENT)rm -rf config.gen diff --git a/ct-ng.in b/ct-ng.in index a056894..fee97c8 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -41,24 +41,24 @@ export CT_STOP:=$(STOP) export CT_RESTART:=$(RESTART) SILENT=@ -ECHO=echo +CT_ECHO=echo ifeq ($(strip $(origin V)),command line) ifeq ($(strip $(V)),0) SILENT=@ - ECHO=: + CT_ECHO=: else ifeq ($(strip $(V)),1) SILENT= - ECHO=: + CT_ECHO=: else ifeq ($(strip $(V)),2) SILENT= - ECHO=echo + CT_ECHO=echo endif # V == 2 endif # V== 1 endif # V == 0 endif # origin V -export V SILENT ECHO +export V SILENT CT_ECHO all: help @@ -122,7 +122,8 @@ help-config:: help-distrib:: help-env:: - @echo ' V=0|1|2 - 0 => show only human-readable messages (default)' + @echo ' V=0|1|2| - show only human-readable messages (default)' + @echo ' 0 => do not show commands or human-readable message' @echo ' 1 => show only the commands being executed' @echo ' 2 => show both' @@ -161,14 +162,14 @@ version: PHONY += clean clean:: - @$(ECHO) " CLEAN log" + @$(CT_ECHO) " CLEAN log" $(SILENT)rm -f build.log - @$(ECHO) " CLEAN build dir" + @$(CT_ECHO) " CLEAN build dir" $(SILENT)[ ! -d targets ] || chmod -R u+w targets $(SILENT)[ ! -d .build ] || chmod -R u+w .build $(SILENT)rm -rf targets .build .build-all PHONY += distclean distclean:: clean - @$(ECHO) " CLEAN .config" + @$(CT_ECHO) " CLEAN .config" $(SILENT)rm -f .config .config.* ..config* diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk index f59de5a..3d330b4 100644 --- a/kconfig/kconfig.mk +++ b/kconfig/kconfig.mk @@ -21,23 +21,23 @@ MCONF := $(CT_LIB_DIR)/kconfig/mconf NCONF := $(CT_LIB_DIR)/kconfig/nconf menuconfig: - @$(ECHO) " CONF $(KCONFIG_TOP)" + @$(CT_ECHO) " CONF $(KCONFIG_TOP)" $(SILENT)$(MCONF) $(KCONFIG_TOP) nconfig: - @$(ECHO) " CONF $(KCONFIG_TOP)" + @$(CT_ECHO) " CONF $(KCONFIG_TOP)" $(SILENT)$(NCONF) $(KCONFIG_TOP) oldconfig: .config - @$(ECHO) " CONF $(KCONFIG_TOP)" + @$(CT_ECHO) " CONF $(KCONFIG_TOP)" $(SILENT)$(CONF) --silent$@ $(KCONFIG_TOP) savedefconfig: .config - @$(ECHO) ' GEN $@' + @$(CT_ECHO) ' GEN $@' $(SILENT)$(CONF) --savedefconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP) defconfig: - @$(ECHO) ' CONF $@' + @$(CT_ECHO) ' CONF $@' $(SILENT)$(CONF) --defconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP) # Always be silent, the stdout an be >.config diff --git a/samples/samples.mk b/samples/samples.mk index 7f5a36c..e9730de 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -117,7 +117,7 @@ $(patsubst %,wiki-%,$(CT_SAMPLES)): config_files PHONY += samples samples: - @$(ECHO) ' MKDIR $@' + @$(CT_ECHO) ' MKDIR $@' $(SILENT)mkdir -p $@ # Save a sample @@ -133,7 +133,7 @@ endef # How we do recall one sample PHONY += $(CT_SAMPLES) $(CT_SAMPLES): config_files - @$(ECHO) " CONF $(KCONFIG_TOP)" + @$(CT_ECHO) " CONF $(KCONFIG_TOP)" $(SILENT)$(CONF) --defconfig=$(call sample_dir,$@)/crosstool.config $(KCONFIG_TOP) @echo @echo '***********************************************************' @@ -176,7 +176,7 @@ host_triplet = $(if $(findstring $(__comma),$(1)),$(firstword $(subst $(__comma) # Create the rule to build a sample # $1: sample name (target tuple, or host/target tuples separated by a comma) define build_sample - @$(ECHO) ' CONF $(1)' + @$(CT_ECHO) ' CONF $(1)' $(SILENT)$(CONF) -s --defconfig=$(call sample_dir,$(1))/crosstool.config $(KCONFIG_TOP) $(SILENT)$(sed) -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(call prefix_dir,$(1))":;' .config $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config @@ -185,7 +185,7 @@ define build_sample $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config $(SILENT)$(CONF) -s --oldconfig $(KCONFIG_TOP) - @$(ECHO) ' BUILD $(1)' + @$(CT_ECHO) ' BUILD $(1)' $(SILENT)if [ ! -z "$(call host_triplet,$(1))" -a -d "$(call prefix_dir,$(call host_triplet,$(1)))" ]; then \ PATH="$$PATH:$(call prefix_dir,$(call host_triplet,$(1)))/bin"; \ fi; \ diff --git a/scripts/scripts.mk b/scripts/scripts.mk index 8373f9b..77368a7 100644 --- a/scripts/scripts.mk +++ b/scripts/scripts.mk @@ -33,16 +33,16 @@ endif PHONY += scripts scripts: - @$(ECHO) ' MKDIR $@' + @$(CT_ECHO) ' MKDIR $@' $(SILENT)mkdir -p $@ $(CONFIG_SUB_DEST): scripts FORCE - @$(ECHO) ' WGET $@' + @$(CT_ECHO) ' WGET $@' $(SILENT)wget $(wget_opt) -O $@ $(CONFIG_SUB_SRC) $(SILENT)chmod u+rwx,go+rx-w $@ $(CONFIG_GUESS_DEST): scripts FORCE - @$(ECHO) ' WGET $@' + @$(CT_ECHO) ' WGET $@' $(SILENT)wget $(wget_opt) -O $@ $(CONFIG_GUESS_SRC) $(SILENT)chmod u+rwx,go+rx-w $@ @@ -50,5 +50,5 @@ $(CONFIG_GUESS_DEST): scripts FORCE # Clean up the mess distclean:: - @$(ECHO) " CLEAN scripts" + @$(CT_ECHO) " CLEAN scripts" $(SILENT)[ $(CT_TOP_DIR) = $(CT_LIB_DIR) ] || rm -rf $(CT_TOP_DIR)/scripts -- cgit v0.10.2-6-g49f6