From 06e32970449694cc37c2fa36a7db261d458baa95 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Tue, 16 Sep 2014 21:52:46 +0200 Subject: Toolchain: prepare use of embtk_include_xtoolpkg by renaming some variables Signed-off-by: Abdoulaye Walsimou Gaye --- core/toolchain/addons.mk | 20 ++++++++++---------- core/toolchain/common.mk | 18 +++++++++--------- core/toolchain/core.mk | 20 ++++++++++---------- core/toolchain/toolchain.mk | 6 +++--- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/core/toolchain/addons.mk b/core/toolchain/addons.mk index 3ef7b8a..898a02f 100644 --- a/core/toolchain/addons.mk +++ b/core/toolchain/addons.mk @@ -33,23 +33,23 @@ TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain_addons # # Addon: strace # -TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install +EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install # # Addon: gdb # -TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDB) += gdb_install -TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install -TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install +EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDB) += gdb_install +EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install +EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install -TOOLCHAIN_ADDONS_DEPS := $(TOOLCHAIN_ADDONS-y) +TOOLCHAIN_ADDONS_DEPS := $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y) # # Toolchain addons build recipe # -__embtk_toolchain_addons-y = $(patsubst %_install,%,$(TOOLCHAIN_ADDONS-y)) -__embtk_toolchain_addons-n = $(patsubst %_install,%,$(TOOLCHAIN_ADDONS-)) +__embtk_toolchain_addons-y = $(patsubst %_install,%,$(EMBTK_TOOLCHAIN_ADDONS_DEPS-y)) +__embtk_toolchain_addons-n = $(patsubst %_install,%,$(EMBTK_TOOLCHAIN_ADDONS_DEPS-)) __embtk_toolsaddons_build_msg = $(call embtk_pinfo,"Building new $(GNU_TARGET)/$(EMBTK_MCU_FLAG) toolchain ADDONS - please wait...") define __embtk_toolchain_addons_build @@ -66,16 +66,16 @@ define __embtk_toolchain_addons_build $(if $(findstring core,$(1)), $(foreach addon,$(__embtk_toolchain_addons-y), $(call embtk_cleanup_pkg,$(addon)))) - $(if $(TOOLCHAIN_ADDONS-), + $(if $(EMBTK_TOOLCHAIN_ADDONS_DEPS-), $(foreach addon,$(__embtk_toolchain_addons-n), $(call embtk_cleanup_pkg,$(addon)))) - $(if $(TOOLCHAIN_ADDONS-y), + $(if $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y), $(foreach pdep,$(__embtk_toolchain_predeps-y), $(call embtk_install_xpkg,$(pdep))) $(foreach addon,$(__embtk_toolchain_addons-y), $(call embtk_install_xpkg,$(addon)))) $(call __embtk_setinstalled_pkg,toolchain_addons) - $(if $(TOOLCHAIN_ADDONS-y), + $(if $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y), $(call __embtk_pkg_gen_dotkconfig_f,toolchain_addons), $(call __embtk_pkg_setkconfigured,toolchain_addons)) endef diff --git a/core/toolchain/common.mk b/core/toolchain/common.mk index 3c6a75d..1a6bcb5 100644 --- a/core/toolchain/common.mk +++ b/core/toolchain/common.mk @@ -44,16 +44,16 @@ TOOLCHAIN_DIR := $(embtk_generated)/toolchains/toolchain-$(__xtools_archos)-$(__ # # Toolchain pre-dependencies # -TOOLCHAIN_PREDEPS-y := ccache_host_install -TOOLCHAIN_PREDEPS-y += m4_host_install -TOOLCHAIN_PREDEPS-y += libtool_host_install -TOOLCHAIN_PREDEPS-y += autoconf_host_install -TOOLCHAIN_PREDEPS-y += automake_host_install -TOOLCHAIN_PREDEPS-y += pkgconf_host_install +EMBTK_TOOLCHAIN_PREDEPS-y := ccache_host_install +EMBTK_TOOLCHAIN_PREDEPS-y += m4_host_install +EMBTK_TOOLCHAIN_PREDEPS-y += libtool_host_install +EMBTK_TOOLCHAIN_PREDEPS-y += autoconf_host_install +EMBTK_TOOLCHAIN_PREDEPS-y += automake_host_install +EMBTK_TOOLCHAIN_PREDEPS-y += pkgconf_host_install ifeq ($(embtk_buildhost_os_type),bsd) -TOOLCHAIN_PREDEPS-y += gsed_host_install gmake_host_install +EMBTK_TOOLCHAIN_PREDEPS-y += gsed_host_install gmake_host_install endif -TOOLCHAIN_PREDEPS-$(CONFIG_EMBTK_TOOLCHAIN_PREDEP_GPERF_HOST) += gperf_host_install +EMBTK_TOOLCHAIN_PREDEPS-$(CONFIG_EMBTK_TOOLCHAIN_PREDEP_GPERF_HOST) += gperf_host_install # # Toolchain macros evaluating if core and addons need to be built @@ -105,5 +105,5 @@ define ___embtk_toolchain_decompress rm -rf $(embtk_sysroot) $(embtk_tools) cd $(embtk_generated) && tar xjf $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE) $(__embtk_toolchain_mkinitdirs) - $(MAKE) $(TOOLCHAIN_PREDEPS-y) + $(MAKE) $(EMBTK_TOOLCHAIN_PREDEPS-y) endef diff --git a/core/toolchain/core.mk b/core/toolchain/core.mk index f1bbc8e..9395c77 100644 --- a/core/toolchain/core.mk +++ b/core/toolchain/core.mk @@ -55,20 +55,20 @@ else __embtk_xtool_compiler-rt-$(CONFIG_EMBTK_HAVE_COMPILER-RT) := compiler-rt_install endif -TOOLCHAIN_DEPS-y := linux_headers_install binutils_install -TOOLCHAIN_DEPS-$(CONFIG_EMBTK_HOST_HAVE_LLVM) += llvm_host_install -TOOLCHAIN_DEPS-y += gcc1_install -TOOLCHAIN_DEPS-$(CONFIG_EMBTK_CLIB_UCLIBC) += $(embtk_clib)_headers_install gcc2_install -TOOLCHAIN_DEPS-y += $(embtk_clib)_install -TOOLCHAIN_DEPS-y += $(__embtk_xtool_gcc3-y) -TOOLCHAIN_DEPS-y += $(__embtk_xtool_compiler-rt-y) -TOOLCHAIN_DEPS := $(TOOLCHAIN_DEPS-y) +EMBTK_TOOLCHAIN_DEPS-y := linux_headers_install binutils_install +EMBTK_TOOLCHAIN_DEPS-$(CONFIG_EMBTK_HOST_HAVE_LLVM) += llvm_host_install +EMBTK_TOOLCHAIN_DEPS-y += gcc1_install +EMBTK_TOOLCHAIN_DEPS-$(CONFIG_EMBTK_CLIB_UCLIBC) += $(embtk_clib)_headers_install gcc2_install +EMBTK_TOOLCHAIN_DEPS-y += $(embtk_clib)_install +EMBTK_TOOLCHAIN_DEPS-y += $(__embtk_xtool_gcc3-y) +EMBTK_TOOLCHAIN_DEPS-y += $(__embtk_xtool_compiler-rt-y) +TOOLCHAIN_DEPS := $(EMBTK_TOOLCHAIN_DEPS-y) # # Toolchain core build recipe # -__embtk_toolchain_deps-y = $(patsubst %_install,%,$(TOOLCHAIN_DEPS)) -__embtk_toolchain_predeps-y = $(patsubst %_install,%,$(TOOLCHAIN_PREDEPS-y)) +__embtk_toolchain_predeps-y = $(patsubst %_install,%,$(EMBTK_TOOLCHAIN_PREDEPS-y)) +__embtk_toolchain_deps-y = $(patsubst %_install,%,$(EMBTK_TOOLCHAIN_DEPS-y)) __embtk_toolchain_built_msg = $(call embtk_pinfo,"New $(GNU_TARGET)/$(EMBTK_MCU_FLAG) toolchain successfully built!") __embtk_toolchain_building_msg = $(call embtk_pinfo,"Building new $(GNU_TARGET)/$(EMBTK_MCU_FLAG) CORE toolchain - please wait...") diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk index e85293b..4778157 100644 --- a/core/toolchain/toolchain.mk +++ b/core/toolchain/toolchain.mk @@ -72,10 +72,10 @@ pembtk_toolchain_mkinitdirs: pembtk_toolchain_predeps_install: $(__embtk_toolchain_mkinitdirs) - $(MAKE) $(TOOLCHAIN_PREDEPS-y) + $(MAKE) $(EMBTK_TOOLCHAIN_PREDEPS-y) # Download target for offline build -TOOLCHAIN_ALL_DEPS := $(TOOLCHAIN_PREDEPS-y) $(TOOLCHAIN_DEPS) -TOOLCHAIN_ALL_DEPS += $(TOOLCHAIN_ADDONS_DEPS) +TOOLCHAIN_ALL_DEPS := $(EMBTK_TOOLCHAIN_PREDEPS-y) $(EMBTK_TOOLCHAIN_DEPS-y) +TOOLCHAIN_ALL_DEPS += $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y) packages_fetch:: $(patsubst %_install,download_%,$(TOOLCHAIN_ALL_DEPS)) -- cgit v1.2.3