Maintain a separate ccache directory for each target.

Otherwise they interfere with each other.  How did I not notice this
before?

diff --git a/Makefile b/Makefile
index 3a3d48a20962090f11a5f2d1c95ab2aedea2fb2a..07f2d3cf6756b26c7f0ef74915cd9beef86248a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -582,6 +582,17 @@ $(CHECK_SCHROOT_SCRIPTS): check-script/%:
        $(call check-symlink,WARN,/etc/schroot/setup.d/$*,$(ABSLOCAL)/etc/schroot/setup.d/$*)
 .PHONY: $(addprefix check-script/,$(SCHROOT_SCRIPTS))
 
        $(call check-symlink,WARN,/etc/schroot/setup.d/$*,$(ABSLOCAL)/etc/schroot/setup.d/$*)
 .PHONY: $(addprefix check-script/,$(SCHROOT_SCRIPTS))
 

+###--------------------------------------------------------------------------
+### Ccache setup.
+
+CCACHE_CONFIGS          = $(foreach r,$(ALL_CHROOTS), \
+       /var/lib/sbuild/build/.ccache/$(LVPREFIX)$r/ccache.conf)
+all:: $(CCACHE_CONFIGS)
+$(CCACHE_CONFIGS): /var/lib/sbuild/build/.ccache/$(LVPREFIX)%/ccache.conf: \
+               etc/ccache.conf
+       $(V_AT)mkdir -p $(dir $@)
+       $(call v_tag,COPY)cp $< $@.new && mv $@.new $@
+

 ###--------------------------------------------------------------------------
 ### `/usr/local/' structure.
 
 ###--------------------------------------------------------------------------
 ### `/usr/local/' structure.
 

diff --git a/bin/buildwrap b/bin/buildwrap
index e367b1be98ba579c48e455c38f878ba86668a082..5b9068d5ecf7017fdfa6d8c86198fdbaea3c913f 100755 (executable)
--- a/bin/buildwrap
+++ b/bin/buildwrap
@@ -26,7 +26,7 @@
 
 ## Set up compiler caching.  This makes a big difference to build times.
 PATH=/usr/lib/ccache:$PATH; export PATH
 
 ## Set up compiler caching.  This makes a big difference to build times.
 PATH=/usr/lib/ccache:$PATH; export PATH

-CCACHE_DIR=/build/.ccache; export CCACHE_DIR
+CCACHE_DIR=/build/.ccache/$SCHROOT_CHROOT_NAME; export CCACHE_DIR

 unset CCACHE_HARDLINK
 CCACHE_COMPRESS=t; export CCACHE_COMPRESS
 CCACHE_UMASK=002; export CCACHE_UMASK
 unset CCACHE_HARDLINK
 CCACHE_COMPRESS=t; export CCACHE_COMPRESS
 CCACHE_UMASK=002; export CCACHE_UMASK

diff --git a/etc/ccache.conf b/etc/ccache.conf
new file mode 100644 (file)
index 0000000..a76ac41
--- /dev/null
+++ b/etc/ccache.conf
@@ -0,0 +1,3 @@
+### -*-conf-*-
+
+max_size = 256Mi