diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-06 23:44:04 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-06 23:44:04 +0200 |
commit | 3185dac9cc43c87caada7f4b181924cbdd6b44bf (patch) | |
tree | 0ca4708016af1732d6a47b96466e2004d3620c94 /mk | |
parent | 5e3252953ed841eafe26862ca8d4710c216c6bb3 (diff) | |
download | embtoolkit-3185dac9cc43c87caada7f4b181924cbdd6b44bf.tar.gz embtoolkit-3185dac9cc43c87caada7f4b181924cbdd6b44bf.tar.bz2 embtoolkit-3185dac9cc43c87caada7f4b181924cbdd6b44bf.tar.xz |
Toolchain: ccache: convert to use generic macros
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r-- | mk/ccache.mk | 56 | ||||
-rw-r--r-- | mk/macros.mk | 2 | ||||
-rw-r--r-- | mk/toolchain.mk | 4 |
3 files changed, 24 insertions, 38 deletions
diff --git a/mk/ccache.mk b/mk/ccache.mk index dfe9534..59233e9 100644 --- a/mk/ccache.mk +++ b/mk/ccache.mk @@ -26,44 +26,28 @@ # \date May 2009 ################################################################################ -CCACHE_VERSION := 3.1.5 -CCACHE_SITE := http://samba.org/ftp/ccache -CCACHE_PACKAGE := ccache-$(CCACHE_VERSION).tar.bz2 -CCACHE_HOST_BUILD_DIR := $(TOOLS_BUILD)/ccachehost-build -CCACHE_HOST_DIR := $(HOSTTOOLS)/usr/local/ccachehost - -CCACHE_DIR := $(CCACHE_HOST_DIR) -HOSTCC_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(HOSTCC)" -HOSTCXX_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(HOSTCXX)" -TARGETCC_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(TARGETCC)" -TARGETCXX_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(TARGETCXX)" +CCACHE_NAME := ccache +CCACHE_VERSION := $(call embtk_get_pkgversion,ccache) +CCACHE_SITE := http://samba.org/ftp/ccache +CCACHE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +CCACHE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/ccache/$(CCACHE_VERSION) +CCACHE_PACKAGE := ccache-$(CCACHE_VERSION).tar.bz2 +CCACHE_SRC_DIR := $(TOOLS_BUILD)/ccache-$(CCACHE_VERSION) +CCACHE_BUILD_DIR := $(TOOLS_BUILD)/ccachehost-build + +CCACHE_HOST_DIR := $(HOSTTOOLS)/usr/local/ccachehost +CCACHE_DIR := $(CCACHE_HOST_DIR) +HOSTCC_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(HOSTCC)" +HOSTCXX_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(HOSTCXX)" +TARGETCC_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(TARGETCC)" +TARGETCXX_CACHED := "$(CCACHE_HOST_DIR)/bin/ccache $(TARGETCXX)" export CCACHE_DIR HOSTCC_CACHED HOSTCXX_CACHED TARGETCC_CACHED TARGETCXX_CACHED -ccachehost_install: $(CCACHE_HOST_BUILD_DIR)/.installed - -$(CCACHE_HOST_BUILD_DIR)/.installed: ccache_download \ - $(CCACHE_HOST_BUILD_DIR)/.decompressed \ - $(CCACHE_HOST_BUILD_DIR)/.configured - $(MAKE) -C $(CCACHE_HOST_BUILD_DIR) $(J) - $(MAKE) -C $(CCACHE_HOST_BUILD_DIR) install - @touch $@ - -ccache_download: - @test -e $(DOWNLOAD_DIR)/$(CCACHE_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(CCACHE_PACKAGE) \ - $(CCACHE_SITE)/$(CCACHE_PACKAGE) +CCACHE_PREFIX := $(CCACHE_HOST_DIR) -$(CCACHE_HOST_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(CCACHE_PACKAGE) ...") - @tar -C $(TOOLS_BUILD) -xjf $(DOWNLOAD_DIR)/$(CCACHE_PACKAGE) - @mkdir -p $(CCACHE_HOST_BUILD_DIR) - @touch $@ +ccache_install: + $(call embtk_install_hostpkg,ccache) -$(CCACHE_HOST_BUILD_DIR)/.configured: - $(call embtk_generic_message,"Configure ccache-$(CCACHE_VERSION) ...") - cd $(CCACHE_HOST_BUILD_DIR) ; \ - $(TOOLS_BUILD)/ccache-$(CCACHE_VERSION)/configure \ - --prefix=$(CCACHE_HOST_DIR) \ - --build=$(HOST_BUILD) --host=$(HOST_ARCH) - @touch $@ +download_ccache: + $(call embtk_download_pkg,ccache) diff --git a/mk/macros.mk b/mk/macros.mk index 3297707..79fc367 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -266,6 +266,8 @@ define embtk_configure_hostpkg @cd $($(PKGV)_BUILD_DIR); \ CPPFLAGS="-I$(HOSTTOOLS)/usr/include" \ LDFLAGS="-L$(HOSTTOOLS)/$(LIBDIR) -L$(HOSTTOOLS)/usr/$(LIBDIR)" \ + $(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CC=$(HOSTCC_CACHED)) \ + $(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CXX=$(HOSTCXX_CACHED)) \ $($(PKGV)_CONFIGURE_ENV) \ $(CONFIG_SHELL) $($(PKGV)_SRC_DIR)/configure \ --build=$(HOST_BUILD) --host=$(HOST_ARCH) \ diff --git a/mk/toolchain.mk b/mk/toolchain.mk index dce0fca..7bfa80b 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -93,7 +93,7 @@ ifeq ($(CONFIG_EMBTK_CLIB_EGLIBC),y) #EGLIBC include $(EMBTK_ROOT)/mk/eglibc.mk TOOLCHAINBUILD := mkinitialpath $(AUTOTOOLS_INSTALL) $(EMBTK_CMAKE_INSTALL) \ - kernel-headers_install ccachehost_install \ + kernel-headers_install ccache_install \ gmphost_install mpfrhost_install mpchost_install \ binutils_install gcc1_install eglibc-headers_install \ gcc2_install eglibc_install gcc3_install @@ -101,7 +101,7 @@ else #uClibc include $(EMBTK_ROOT)/mk/uclibc.mk TOOLCHAINBUILD := mkinitialpath $(AUTOTOOLS_INSTALL) $(EMBTK_CMAKE_INSTALL) \ - kernel-headers_install ccachehost_install \ + kernel-headers_install ccache_install \ gmphost_install mpfrhost_install mpchost_install \ binutils_install gcc1_install uclibc_install gcc3_install endif |