diff options
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | packages/htools/ccache/ccache.kconfig | 10 | ||||
-rw-r--r-- | packages/htools/ccache/ccache.mk | 57 | ||||
-rw-r--r-- | packages/htools/ccache/vars.mk | 61 | ||||
-rw-r--r-- | packages/htools/hosttools-buildopts.mk | 3 | ||||
-rw-r--r-- | toolchain/toolchain.mk | 2 |
6 files changed, 80 insertions, 56 deletions
@@ -130,3 +130,6 @@ include toolchain/toolchain.mk include mk/packages.mk include mk/rootfs/rootfs.mk include mk/help.mk + +testinstall: + @echo "$(call __embtk_pkg_runrecipe-y,ccache_host)" diff --git a/packages/htools/ccache/ccache.kconfig b/packages/htools/ccache/ccache.kconfig index c8dab4f..adf7dbd 100644 --- a/packages/htools/ccache/ccache.kconfig +++ b/packages/htools/ccache/ccache.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2011-2012 Abdoulaye Walsimou GAYE. +# Copyright(C) 2011-2014 Abdoulaye Walsimou GAYE. # # This program is free software; you can distribute it and/or modify it ## @@ -25,7 +25,7 @@ # \date July 2011 ################################################################################ -config EMBTK_HAVE_CCACHE +config EMBTK_HOST_HAVE_CCACHE bool default y help @@ -34,11 +34,11 @@ config EMBTK_HAVE_CCACHE compilation is being done again. Supported languages are C, C++, Objective-C and Objective-C++. -config EMBTK_CCACHE_VERSION_STRING +config EMBTK_CCACHE_HOST_VERSION_STRING string default "3.1.9" -config EMBTK_CCACHE_NEED_PATCH +config EMBTK_CCACHE_HOST_NEED_PATCH bool -config EMBTK_CCACHE_NEED_AUTORECONF +config EMBTK_CCACHE_HOST_NEED_AUTORECONF bool diff --git a/packages/htools/ccache/ccache.mk b/packages/htools/ccache/ccache.mk index 2c93f33..9e8432b 100644 --- a/packages/htools/ccache/ccache.mk +++ b/packages/htools/ccache/ccache.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2013 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE. # # This program is free software; you can distribute it and/or modify it ## @@ -26,54 +26,13 @@ # \date May 2009 ################################################################################ -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 := $(embtk_toolsb)/ccache-$(CCACHE_VERSION) -CCACHE_BUILD_DIR := $(embtk_toolsb)/ccachehost-build +CCACHE_HOST_NAME := ccache +CCACHE_HOST_VERSION := $(call embtk_get_pkgversion,ccache_host) +CCACHE_HOST_SITE := http://samba.org/ftp/ccache +CCACHE_HOST_PACKAGE := ccache-$(CCACHE_HOST_VERSION).tar.bz2 +CCACHE_HOST_SRC_DIR := $(embtk_toolsb)/ccache-$(CCACHE_HOST_VERSION) +CCACHE_HOST_BUILD_DIR := $(embtk_toolsb)/ccachehost-build -CCACHE_DIR := $(EMBTK_ROOT)/.ccache -CCACHE_BIN := $(embtk_htools)/usr/bin/ccache - -# Variables for use in env -__ccache_clang_cflags := $(if $(embtk_hostcc_clang-y),-Qunused-arguments -fcolor-diagnostics) -__HOSTCC_CACHED := $(CCACHE_BIN) $(HOSTCC) $(__ccache_clang_cflags) -HOSTCC_CACHED := "$(__HOSTCC_CACHED)" -__HOSTCXX_CACHED := $(CCACHE_BIN) $(HOSTCXX) $(__ccache_clang_cflags) -HOSTCXX_CACHED := "$(__HOSTCXX_CACHED)" - -CROSS_COMPILE_CACHED := "$(CCACHE_BIN) $(CROSS_COMPILE)" -TARGETCC_CACHED := "$(CCACHE_BIN) $(TARGETCC)" -TARGETCXX_CACHED := "$(CCACHE_BIN) $(TARGETCXX)" - -TARGETGCC_CACHED := "$(CCACHE_BIN) $(TARGETGCC)" -TARGETGCXX_CACHED := "$(CCACHE_BIN) $(TARGETGCXX)" - -TARGETCLANG_CACHED := "$(CCACHE_BIN) $(TARGETCLANG)" -TARGETCLANGXX_CACHED := "$(CCACHE_BIN) $(TARGETCLANGXX)" - -# Variables for use directly -hostcc_cached := $(CCACHE_BIN) $(HOSTCC) -hostcxx_cached := $(CCACHE_BIN) $(HOSTCXX) - -targetcc_cached := $(CCACHE_BIN) $(TARGETCC) -targetcxx_cached := $(CCACHE_BIN) $(TARGETCXX) - -targetgcc_cached := $(CCACHE_BIN) $(TARGETGCC) -targetgcxx_cached := $(CCACHE_BIN) $(TARGETGCXX) - -targetclang_cached := $(CCACHE_BIN) $(TARGETCLANG) -targetclangxx_cached := $(CCACHE_BIN) $(TARGETCLANGXX) - -export CCACHE_DIR HOSTCC_CACHED HOSTCXX_CACHED TARGETCC_CACHED TARGETCXX_CACHED - -define embtk_install_ccache - $(call __embtk_install_hostpkg,ccache) -endef - -define embtk_postinstallonce_ccache +define embtk_postinstallonce_ccache_host CCACHE_DIR=$(CCACHE_DIR) $(CCACHE_BIN) --max-size=2GB endef diff --git a/packages/htools/ccache/vars.mk b/packages/htools/ccache/vars.mk new file mode 100644 index 0000000..26986a2 --- /dev/null +++ b/packages/htools/ccache/vars.mk @@ -0,0 +1,61 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE. +# +# This program is free software; you can distribute it and/or modify it +## +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +################################################################################ +# +# \file vars.mk +# \brief variables defined by ccache +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# \date May 2009 +################################################################################ + +CCACHE_DIR := $(EMBTK_ROOT)/.ccache +CCACHE_BIN := $(embtk_htools)/usr/bin/ccache + +# Variables for use in env +__ccache_clang_cflags := $(if $(embtk_hostcc_clang-y),-Qunused-arguments -fcolor-diagnostics) +__HOSTCC_CACHED := $(CCACHE_BIN) $(HOSTCC) $(__ccache_clang_cflags) +HOSTCC_CACHED := "$(__HOSTCC_CACHED)" +__HOSTCXX_CACHED := $(CCACHE_BIN) $(HOSTCXX) $(__ccache_clang_cflags) +HOSTCXX_CACHED := "$(__HOSTCXX_CACHED)" + +CROSS_COMPILE_CACHED := "$(CCACHE_BIN) $(CROSS_COMPILE)" +TARGETCC_CACHED := "$(CCACHE_BIN) $(TARGETCC)" +TARGETCXX_CACHED := "$(CCACHE_BIN) $(TARGETCXX)" + +TARGETGCC_CACHED := "$(CCACHE_BIN) $(TARGETGCC)" +TARGETGCXX_CACHED := "$(CCACHE_BIN) $(TARGETGCXX)" + +TARGETCLANG_CACHED := "$(CCACHE_BIN) $(TARGETCLANG)" +TARGETCLANGXX_CACHED := "$(CCACHE_BIN) $(TARGETCLANGXX)" + +# Variables for use directly +hostcc_cached := $(CCACHE_BIN) $(HOSTCC) +hostcxx_cached := $(CCACHE_BIN) $(HOSTCXX) + +targetcc_cached := $(CCACHE_BIN) $(TARGETCC) +targetcxx_cached := $(CCACHE_BIN) $(TARGETCXX) + +targetgcc_cached := $(CCACHE_BIN) $(TARGETGCC) +targetgcxx_cached := $(CCACHE_BIN) $(TARGETGCXX) + +targetclang_cached := $(CCACHE_BIN) $(TARGETCLANG) +targetclangxx_cached := $(CCACHE_BIN) $(TARGETCLANGXX) + +export CCACHE_DIR HOSTCC_CACHED HOSTCXX_CACHED TARGETCC_CACHED TARGETCXX_CACHED diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index 916e5d7..ba6d1ab 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -26,4 +26,5 @@ embtk_pkgincdir := packages/htools # cache -$(call embtk_include_hostpkg,ccache) +include packages/htools/ccache/vars.mk +$(call embtk_include_hostpkg,ccache_host) diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk index 8dbefa3..553342e 100644 --- a/toolchain/toolchain.mk +++ b/toolchain/toolchain.mk @@ -110,7 +110,7 @@ TOOLCHAIN_NAME := toolchain TOOLCHAIN_BUILD_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain-toolchain TOOLCHAIN_SRC_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain-toolchain -TOOLCHAIN_PRE_DEPS-y := ccache_install $(AUTOTOOLS_INSTALL) +TOOLCHAIN_PRE_DEPS-y := ccache_host_install $(AUTOTOOLS_INSTALL) ifeq ($(embtk_buildhost_os_type),bsd) TOOLCHAIN_PRE_DEPS-y += gsed_install gmake_install endif |