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 72fdf76dbb268591978ee964cd128c3d2fee6e42 (commit) via fcefb14a86cdb0f9ba1c86ef7688757c4e01847e (commit) from 92ac27db09b3c2c6279d33272ff82be48962b14b (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 72fdf76dbb268591978ee964cd128c3d2fee6e42 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 13 18:29:35 2013 +0200

Update .gitignore.

commit fcefb14a86cdb0f9ba1c86ef7688757c4e01847e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 13 18:27:58 2013 +0200

ccache: Fix testsuite error with GCC 4.8.

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

Summary of changes: .gitignore | 15 --- ccache/ccache.nm | 2 +- ccache/patches/ccache-3.1.9-gcc48-tests.patch | 158 ++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 16 deletions(-) create mode 100644 ccache/patches/ccache-3.1.9-gcc48-tests.patch

Difference in files: diff --git a/.gitignore b/.gitignore index 88d9675..b25c15b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1 @@ -/.build_spy* -/.config -/build -/cache -/ccache -/doc/ChangeLog -/doc/packages-list.txt -/logs -/tmp -/vm -/*.diff -/*.iso -/*.tar.gz -*.py[co] *~ -*.py[co] diff --git a/ccache/ccache.nm b/ccache/ccache.nm index a7d1ea1..9ee3f8a 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -5,7 +5,7 @@

name = ccache version = 3.1.9 -release = 2 +release = 3

groups = Development/Compilers url = http://ccache.samba.org/ diff --git a/ccache/patches/ccache-3.1.9-gcc48-tests.patch b/ccache/patches/ccache-3.1.9-gcc48-tests.patch new file mode 100644 index 0000000..0175e6b --- /dev/null +++ b/ccache/patches/ccache-3.1.9-gcc48-tests.patch @@ -0,0 +1,158 @@ +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