[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-150-g836332c

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  836332cabfa1f1cef885c509afd18cc4f41b0130 (commit)
      from  4390180f144d377a829102c086ad2b7072b0d116 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 836332cabfa1f1cef885c509afd18cc4f41b0130
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Mar 16 18:19:25 2012 +0100

    [BUILDROOT] 2012.02: Add patch to prevent lzo package configuration failure on 64bits Hosts

-----------------------------------------------------------------------

Summary of changes:
 ...che-force_ccache_to_use_its_internal_zlib.patch |   49 ++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2012.02/180-ccache-force_ccache_to_use_its_internal_zlib.patch

diff --git a/patches/buildroot/2012.02/180-ccache-force_ccache_to_use_its_internal_zlib.patch b/patches/buildroot/2012.02/180-ccache-force_ccache_to_use_its_internal_zlib.patch
new file mode 100644
index 0000000..7d8fe1f
--- /dev/null
+++ b/patches/buildroot/2012.02/180-ccache-force_ccache_to_use_its_internal_zlib.patch
@@ -0,0 +1,49 @@
+From 7ea11dafff37c5403432f691cf3c46d1d5566e46 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <tho...@fr...>
+Date: Wed, 07 Mar 2012 19:26:49 +0000
+Subject: ccache: 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.
+
+Fixes bug #4808.
+
+Thanks to Raúl Sánchez Siles <rsa...@in...> for reporting
+the bug and testing the proposed solution.
+
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+(limited to 'package/ccache/ccache.mk')
+
+diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
+index 9155441..393989f 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
+--
+cgit v0.9.0.1-2-gef13


hooks/post-receive
-- 
armadeus