diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 10:18:17 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 10:18:17 +0100 |
| commit | dbd90668a07f2deffc9b0bd658b1cc3958e00647 (patch) | |
| tree | ead9876f7721dfd670c17466351cc608ec5af6d3 | |
| parent | 66930ee6c1e0032c50f64c25755e46c327631239 (diff) | |
| parent | 2baedf828edf246b8d0bd530ec9e1481b2009518 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | scripts/scan-pkgs.sh | 7 | ||||
| -rw-r--r-- | target/config/Config.in.adk | 1 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 4 | ||||
| -rw-r--r-- | tools/Makefile | 3 | ||||
| -rw-r--r-- | tools/ccache/Makefile | 25 |
5 files changed, 33 insertions, 7 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 5563dcca2..8af04795b 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -83,11 +83,4 @@ if [[ -n $NEED_JAVA ]]; then fi fi -if [[ -n $ADK_USE_CCACHE ]]; then - if ! which ccache >/dev/null 2>&1; then - echo >&2 You have selected to build with ccache, but ccache could not be found. - out=1 - fi -fi - exit $out diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index c8f820321..46de14044 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -46,6 +46,7 @@ config ADK_WGET_TIMEOUT config ADK_USE_CCACHE bool "Use ccache to speedup recompilation" + select ADK_HOST_NEED_CCACHE default n help Useful if you have enough space for the cache and need speedup compilation. diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index d863179b8..c4dcdace4 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -34,6 +34,10 @@ config ADK_HOST_NEED_XZ boolean default n +config ADK_HOST_NEED_CCACHE + boolean + default n + config ADK_TOOLS_ADDPATTERN_ARGS string default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G diff --git a/tools/Makefile b/tools/Makefile index 2d29372dc..a8156cb79 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -29,6 +29,9 @@ endif ifeq ($(ADK_HOST_NEED_LZMA),y) TARGETS+=lzma endif +ifeq ($(ADK_HOST_NEED_CCACHE),y) +TARGETS+=ccache +endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile new file mode 100644 index 000000000..fde838067 --- /dev/null +++ b/tools/ccache/Makefile @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= ccache +PKG_VERSION:= 3.1.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a5e9954b1dae036762f7b13673a2cf76 +PKG_SITES:= http://samba.org/ftp/ccache/ + +include ../rules.mk + +install: ${STAGING_HOST_DIR}/usr/bin/ccache + +$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared + (cd ${WRKBUILD}; ./configure --prefix=$(STAGING_HOST_DIR)/usr) + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' + touch $@ + +${STAGING_HOST_DIR}/usr/bin/ccache: $(WRKBUILD)/.compiled + $(INSTALL_BIN) $(WRKBUILD)/ccache \ + ${STAGING_HOST_DIR}/usr/bin + +include $(TOPDIR)/mk/tools.mk |