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 "IPFire 3.x development tree".

The branch, master has been updated via e0f5e37185865175c2e3872b199cd102dec27a86 (commit) from e63ec62158eedb421dfa8ed67908e9ccd7666015 (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 e0f5e37185865175c2e3872b199cd102dec27a86 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 1 18:07:05 2015 +0100

ccache: Update to 3.2.1

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

Summary of changes: ccache/ccache.nm | 9 +- ccache/patches/ccache-3.1.9-gcc48-tests.patch | 158 -------------------------- 2 files changed, 6 insertions(+), 161 deletions(-) delete mode 100644 ccache/patches/ccache-3.1.9-gcc48-tests.patch

Difference in files: diff --git a/ccache/ccache.nm b/ccache/ccache.nm index 9ee3f8a..8d5d36f 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -4,8 +4,8 @@ ###############################################################################

name = ccache -version = 3.1.9 -release = 3 +version = 3.2.1 +release = 1

groups = Development/Compilers url = http://ccache.samba.org/ @@ -39,10 +39,13 @@ build prepare_cmds # Disable pch test that fails sed -e "s/^pch_suite.*/& return 0/" -i test.sh + + # Remove shipped zlib + rm -rf zlib end

test - make check + SHELL=/bin/bash make check end

install_cmds diff --git a/ccache/patches/ccache-3.1.9-gcc48-tests.patch b/ccache/patches/ccache-3.1.9-gcc48-tests.patch deleted file mode 100644 index 0175e6b..0000000 --- a/ccache/patches/ccache-3.1.9-gcc48-tests.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff -up ccache-3.1.9/test.sh~ ccache-3.1.9/test.sh ---- ccache-3.1.9/test.sh~ 2013-01-06 18:57:59.000000000 +0200 -+++ ccache-3.1.9/test.sh 2013-03-31 21:37:24.647552458 +0300 -@@ -3,7 +3,7 @@ - # A simple test suite for ccache. - # - # Copyright (C) 2002-2007 Andrew Tridgell --# Copyright (C) 2009-2012 Joel Rosdahl -+# Copyright (C) 2009-2013 Joel Rosdahl - # - # This program is free software; you can redistribute it and/or modify it under - # the terms of the GNU General Public License as published by the Free Software -@@ -562,6 +562,12 @@ int test3; - EOF - backdate test1.h test2.h test3.h - -+ $COMPILER -c -Wp,-MD,expected.d test.c -+ expected_d_content=`cat expected.d` -+ -+ $COMPILER -c -Wp,-MMD,expected_mmd.d test.c -+ expected_mmd_d_content=`cat expected_mmd.d` -+ - ################################################################## - # First compilation is a miss. - testname="first compilation" -@@ -677,7 +683,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -685,7 +691,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -698,7 +704,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_mmd_d_content" - - rm -f other.d - -@@ -706,7 +712,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_mmd_d_content" - - rm -f other.d - -@@ -760,7 +766,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -768,7 +774,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - ################################################################## - # Check the scenario of running a ccache with direct mode on a cache -@@ -780,7 +786,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -788,7 +794,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 1 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -796,7 +802,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 2 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -804,7 +810,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 2 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - ################################################################## - # Check that -MF works. -@@ -815,7 +821,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -823,7 +829,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - ################################################################## - # Check that a missing .d file in the cache is handled correctly. -@@ -835,13 +841,13 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - $CCACHE $COMPILER -c -MD test.c - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - find $CCACHE_DIR -name '*.d' -exec rm -f '{}' ; - -@@ -849,7 +855,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 1 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - ################################################################## - # Check that stderr from both the preprocessor and the compiler is emitted

hooks/post-receive -- IPFire 3.x development tree