From 7ea11dafff37c5403432f691cf3c46d1d5566e46 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Mar 2012 20:26:49 +0100 Subject: [PATCH] ccache: Force ccache to use its internal zlib MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The problem is that without this, ccache would link against the zlib of the build system, but we might build and install a different version of zlib in $(O)/host afterwards, which ccache will pick up. This might break if there is a version mismatch. A solution would be to add host-zlib has a dependency of ccache, but it would require tuning the zlib .mk file to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy path: tell ccache to use its internal copy of zlib, so that ccache has zero dependency besides the C library. Fixes bug #4808. Thanks to Raúl Sánchez Siles for reporting the bug and testing the proposed solution. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 9155441087..393989f546 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -14,6 +14,17 @@ CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.bz2 HOST_CCACHE_CONF_ENV = \ CC="$(HOSTCC_NOCCACHE)" +# Force ccache to use its internal zlib. The problem is that without +# this, ccache would link against the zlib of the build system, but we +# might build and install a different version of zlib in $(O)/host +# afterwards, which ccache will pick up. This might break if there is +# a version mismatch. A solution would be to add host-zlib has a +# dependency of ccache, but it would require tuning the zlib .mk file +# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy +# path: tell ccache to use its internal copy of zlib, so that ccache +# has zero dependency besides the C library. +HOST_CCACHE_CONF_OPT += ccache_cv_zlib_1_2_3=no + # We directly hardcode the cache location into the binary, as it is # much easier to handle than passing an environment variable. define HOST_CCACHE_FIX_CCACHE_DIR -- 2.30.2