From d9408b1837d977ee839754199e7ad7c6943a7290 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 3 Nov 2012 13:36:42 +0100 Subject: Build system: Fix after 2d6015b53d9152174 Signed-off-by: Abdoulaye Walsimou Gaye --- mk/buildsystem.mk | 5 +++-- mk/eglibc.mk | 14 +++++++------- mk/makedevs.mk | 6 +++--- mk/mkimage.mk | 10 +++++----- mk/toolchain.mk | 24 +++++++++++++----------- 5 files changed, 31 insertions(+), 28 deletions(-) (limited to 'mk') diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 791f9db..f1ef0ca 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -122,8 +122,9 @@ define __embtk_mk_startbuild $(MAKE) toolchain_install rootfs_build successful_build endef + startbuild: - $(if $(call __embtk_mk_pathexist,$(GCC3_BUILD_DIR)/.installed), \ + $(if $(call __embtk_mk_pathexist,$(call __embtk_pkg_dotinstalled_f,gcc3)), \ $(__embtk_mk_pwarning_restartbuild),$(__embtk_mk_startbuild)) define __embtk_mk_initsysrootdirs @@ -133,7 +134,7 @@ define __embtk_mk_initsysrootdirs mkdir -p $(embtk_sysroot)/usr/etc mkdir -p $(embtk_sysroot)/root mkdir -p $(embtk_sysroot)/usr/lib - $(if $(CONFIG_EMBTK_32BITS_FS),,cd $(embtk_sysroot); \ + $(if $(CONFIG_EMBTK_32BITS_FS),,cd $(embtk_sysroot); \ ln -sf lib lib64; cd $(embtk_sysroot)/usr;ln -sf lib lib64) $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), \ cd $(embtk_sysroot); ln -sf lib lib64; mkdir -p lib32; \ diff --git a/mk/eglibc.mk b/mk/eglibc.mk index 5204505..ff0125c 100644 --- a/mk/eglibc.mk +++ b/mk/eglibc.mk @@ -107,13 +107,13 @@ define embtk_configure_eglibc AR=$(TARGETAR) \ RANLIB=$(TARGETRANLIB) \ $(CONFIG_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ - --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ + --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ --host=$(STRICT_GNU_TARGET) --build=$(HOST_BUILD) \ $(embtk_eglibc_floattype) --disable-profile --without-gd --without-cvs \ --enable-add-ons --enable-kernel="2.6.27" $(embtk_eglibc_versioning-y) \ --with-bugurl=$(EMBTK_BUGURL) \ --with-pkgversion="EGLIBC from embtoolkit-$(EMBTK_VERSION)" - touch $(EGLIBC_BUILD_DIR)/.conifgured + touch $(EGLIBC_BUILD_DIR)/.eglibc.embtk.conifgured endef define embtk_configure_eglibc_headers @@ -125,19 +125,19 @@ define embtk_configure_eglibc_headers AR=$(TARGETAR) \ RANLIB=$(TARGETRANLIB) \ $(CONFIG_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ - --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ + --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ --host=$(STRICT_GNU_TARGET) --build=$(HOST_BUILD) \ $(embtk_eglibc_floattype) --disable-profile --without-gd --without-cvs \ --enable-add-ons --enable-kernel="2.6.27" $(embtk_eglibc_versioning-y) \ --with-bugurl=$(EMBTK_BUGURL) - touch $(EGLIBC_HEADERS_BUILD_DIR)/.configured + touch $(EGLIBC_HEADERS_BUILD_DIR)/.eglibc_headers.embtk.configured endef define embtk_install_eglibc PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) $(J) PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) install \ install_root=$(embtk_sysroot) - touch $(EGLIBC_BUILD_DIR)/.installed + touch $(EGLIBC_BUILD_DIR)/.eglibc.embtk.installed endef define embtk_install_eglibc_headers @@ -148,8 +148,8 @@ define embtk_install_eglibc_headers cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crti.o $(embtk_sysroot)/usr/lib/ cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crtn.o $(embtk_sysroot)/usr/lib/ $(TARGETCC) -nostdlib -nostartfiles -shared -x c /dev/null \ - -o $(embtk_sysroot)/usr/lib/libc.so - touch $(EGLIBC_HEADERS_BUILD_DIR)/.installed + -o $(embtk_sysroot)/usr/lib/libc.so + touch $(EGLIBC_HEADERS_BUILD_DIR)/.eglibc_headers.embtk.installed endef __embtk_get_eglibc_optgroups = grep "CONFIG_KEMBTK_EGLIBC_" $(EMBTK_DOTCONFIG) \ diff --git a/mk/makedevs.mk b/mk/makedevs.mk index 20cba03..572ae69 100644 --- a/mk/makedevs.mk +++ b/mk/makedevs.mk @@ -30,10 +30,10 @@ MAKEDEVS_DIR := $(embtk_htools)/usr/bin MAKEDEVS_BIN := $(MAKEDEVS_DIR)/makedevs makedevs_install: - [ -e $(MAKEDEVS_BUILD_DIR)/.installed ] || \ - $(MAKE) $(MAKEDEVS_BUILD_DIR)/.installed + [ -e $(MAKEDEVS_BUILD_DIR)/.makedevs.embtk.installed ] || \ + $(MAKE) $(MAKEDEVS_BUILD_DIR)/.makedevs.embtk.installed -$(MAKEDEVS_BUILD_DIR)/.installed: +$(MAKEDEVS_BUILD_DIR)/.makedevs.embtk.installed: $(call embtk_pinfo,"Installing makedevs...") $(Q)mkdir -p $(MAKEDEVS_BUILD_DIR) $(Q)mkdir -p $(embtk_htools)/usr diff --git a/mk/mkimage.mk b/mk/mkimage.mk index 783b78b..cb8ba56 100644 --- a/mk/mkimage.mk +++ b/mk/mkimage.mk @@ -24,11 +24,11 @@ # \date August 2010 ################################################################################ -MAKEIMAGE_VERSION := 0.4 -MAKEIMAGE_SITE := http://ftp.debian.org/debian/pool/main/u/uboot-mkimage -MAKEIMAGE_PACKAGE := -MAKEIMAGE_BUILD_DIR := $(embtk_toolsb)/mkimage -MAKEIMAGE_BIN := $(embtk_htools)/usr/bin/mkimage +MAKEIMAGE_VERSION := 0.4 +MAKEIMAGE_SITE := http://ftp.debian.org/debian/pool/main/u/uboot-mkimage +MAKEIMAGE_PACKAGE := +MAKEIMAGE_BUILD_DIR := $(embtk_toolsb)/mkimage +MAKEIMAGE_BIN := $(embtk_htools)/usr/bin/mkimage export MAKEIMAGE_BIN mkimage_install: diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 6768462..8123f27 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -97,6 +97,7 @@ TOOLCHAIN_NAME := toolchain TOOLCHAIN_PACKAGE := toolchain-$(GNU_TARGET)-$(embtk_clib)-$(EMBTK_MCU_FLAG).tar.bz2 TOOLCHAIN_DIR := $(embtk_generated)/toolchain-$(GNU_TARGET)-$(embtk_clib)-$(EMBTK_MCU_FLAG) TOOLCHAIN_BUILD_DIR := $(TOOLCHAIN_DIR) +TOOLCHAIN_SRC_DIR := $(TOOLCHAIN_DIR) TOOLCHAIN_PRE_DEPS-y := ccache_install $(AUTOTOOLS_INSTALL) TOOLCHAIN_PRE_DEPS-y += $(if $(CONFIG_EMBTK_TOOLCHAIN_PREDEP_GPERF_HOST), \ @@ -110,6 +111,7 @@ TOOLCHAIN_DEPS += gcc2_install $(embtk_clib)_install gcc3_install TOOLCHAIN_ADDONS_NAME := toolchain-addons TOOLCHAIN_ADDONS_DEPS := $(TOOLCHAIN_ADDONS-y) TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_BUILD_DIR)/.addons +TOOLCHAIN_ADDONS_SRC_DIR := $(TOOLCHAIN_BUILD_DIR)/.addons -include $(EMBTK_ROOT)/mk/$(embtk_clib).mk @@ -139,17 +141,17 @@ define ___embtk_toolchain_decompress $(__embtk_toolchain_mkinitdirs) $(MAKE) $(TOOLCHAIN_PRE_DEPS-y) mkdir -p $(GCC3_BUILD_DIR) - touch $(GCC3_BUILD_DIR)/.installed + touch $(call __embtk_pkg_dotinstalled_f,gcc3) touch $(GCC3_BUILD_DIR)/.gcc3_post_install $(MAKE) __embtk_gcc3_printmetakconfigs > \ $(call __embtk_pkg_dotpkgkconfig_f,gcc3) endef define __embtk_toolchain_decompress - $(if $(call __embtk_mk_pathnotexist,$(TOOLCHAIN_DIR)/.decompressed), + $(if $(call __embtk_mk_pathnotexist,$(call __embtk_pkg_dotdecompressed_f,toolchain)), $(call embtk_pinfo,"Decompressing $(GNU_TARGET)/$(EMBTK_MCU_FLAG) toolchain - please wait...") $(___embtk_toolchain_decompress) - touch $(TOOLCHAIN_DIR)/.decompressed) + touch $(call __embtk_pkg_dotdecompressed_f,toolchain)) endef __embtk_toolchain_addons-y = $(patsubst %_install,%,$(TOOLCHAIN_ADDONS-y)) @@ -157,19 +159,19 @@ __embtk_toolchain_addons-n = $(patsubst %_install,%,$(TOOLCHAIN_ADDONS-)) define __embtk_toolchain_build $(if $(findstring core,$(1)), $(call embtk_pinfo,"Building new $(GNU_TARGET)/$(EMBTK_MCU_FLAG) CORE toolchain - please wait...") - rm -rf $(TOOLCHAIN_DIR)/.installed - rm -rf $(TOOLCHAIN_DIR)/.decompressed + rm -rf $(call __embtk_pkg_dotinstalled_f,toolchain) + rm -rf $(call __embtk_pkg_dotdecompressed_f,toolchain) $(foreach dep,$(patsubst %_install,%,$(TOOLCHAIN_DEPS)), $(MAKE) $(dep)_clean;) $(foreach pkg,$(__embtk_rootfs_pkgs-y),$(MAKE) $(pkg)_clean;) rm -rf $(embtk_sysroot) $(embtk_tools) $(__embtk_toolchain_mkinitdirs) $(MAKE) $(TOOLCHAIN_PRE_DEPS-y) $(TOOLCHAIN_DEPS) - touch $(TOOLCHAIN_DIR)/.installed) + touch $(call __embtk_pkg_dotinstalled_f,toolchain)) $(if $(findstring addons,$(1)), $(call embtk_pinfo,"Building new $(GNU_TARGET)/$(EMBTK_MCU_FLAG) toolchain ADDONS - please wait...") - rm -rf $(TOOLCHAIN_ADDONS_BUILD_DIR)/.installed - rm -rf $(TOOLCHAIN_DIR)/.decompressed + rm -rf $(TOOLCHAIN_ADDONS_BUILD_DIR)/.toolchain-addons.installed + rm -rf $(TOOLCHAIN_DIR)/.toolchain-addons.decompressed $(if $(findstring core,$(1)),,$(___embtk_toolchain_decompress)) $(if $(findstring core,$(1)), $(foreach addon,$(__embtk_toolchain_addons-y), @@ -179,11 +181,11 @@ define __embtk_toolchain_build $(MAKE) $(addon)_clean;)) $(if $(TOOLCHAIN_ADDONS-y), $(MAKE) $(TOOLCHAIN_PRE_DEPS-y) $(TOOLCHAIN_ADDONS-y)) - touch $(TOOLCHAIN_ADDONS_BUILD_DIR)/.installed) + touch $(call __embtk_pkg_dotinstalled_f,toolchain_addons)) $(if $(findstring core,$(1))$(findstring addons,$(1)), $(__embtk_toolchain_symlinktools) $(__embtk_toolchain_compress) - touch $(TOOLCHAIN_DIR)/.decompressed + touch $(call __embtk_pkg_dotdecompressed_f,toolchain) $(call embtk_pinfo,"New $(GNU_TARGET)/$(EMBTK_MCU_FLAG) toolchain successfully built!"), $(__embtk_toolchain_decompress)) endef @@ -207,7 +209,7 @@ toolchain_install: $(Q)$(call __embtk_toolchain_build,$(__embtk_toolchain_buildargs)) define __embtk_toolchain_clean - rm -rf $(TOOLCHAIN_DIR)/.decompressed + rm -rf $(call __embtk_pkg_dotdecompressed_f,toolchain) endef toolchain_clean: -- cgit v1.2.3