From f9a5dea561e053fd422abca1e27a759e9a1fe61b Mon Sep 17 00:00:00 2001 From: Alan Griffiths Date: Fri, 6 Jan 2023 10:39:51 +0000 Subject: [PATCH] Missed spread change --- debian/rules | 6 +++++- spread.yaml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d811b13c857..09f77c1414e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,10 @@ include debian/opts.mk export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 +# Needed for ccache to work in case the build directory changed +# (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810871) +export CCACHE_BASEDIR = $(shell pwd) + %: dh $@ -Bbuild-$(DEB_HOST_ARCH) --parallel --fail-missing @@ -60,7 +64,7 @@ endif ifeq ($(USER) $(DEB_HOST_ARCH),buildd riscv64) COMMON_CONFIGURE_OPTIONS += -DMIR_RUN_MIRAL_TESTS=OFF # Disable unit tests on Launchpad riscv64 jammy kinetic - ifneq ($(filter jammy kinetic,$(DEB_DISTRIBUTION)),) + ifneq ($(filter jammy kinetic lunar,$(DEB_DISTRIBUTION)),) COMMON_CONFIGURE_OPTIONS += -DMIR_RUN_UNIT_TESTS=OFF endif endif diff --git a/spread.yaml b/spread.yaml index 543abb9bd56..0cbcf89721b 100644 --- a/spread.yaml +++ b/spread.yaml @@ -49,6 +49,9 @@ environment: NOCHECK: "" NOCHECK/asan,tsan,ubsan,asan_clang,tsan_clang,ubsan_clang: nocheck CTEST_OUTPUT_ON_FAILURE: 1 + CCACHE_DIR: /root/.ccache + # Needed for precompiled headers (https://ccache.dev/manual/latest.html#_precompiled_headers) + CCACHE_SLOPPINESS: time_macros,pch_defines,include_file_mtime,include_file_ctime prepare: | # NOTE: This part of the code needs to be in spread.yaml as it runs before