Hello community, here is the log from the commit of package ccache for openSUSE:Factory checked in at 2013-06-28 11:49:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccache (Old) and /work/SRC/openSUSE:Factory/.ccache.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ccache" Changes: -------- --- /work/SRC/openSUSE:Factory/ccache/ccache.changes 2013-02-25 20:33:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ccache.new/ccache.changes 2013-06-28 11:49:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 25 08:44:41 UTC 2013 - pgajdos@suse.com + +- fixed build with gcc 4.8 + * ccache-gcc48.patch + +------------------------------------------------------------------- New: ---- ccache-gcc48.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccache.spec ++++++ --- /var/tmp/diff_new_pack.w6Wr2F/_old 2013-06-28 11:49:02.000000000 +0200 +++ /var/tmp/diff_new_pack.w6Wr2F/_new 2013-06-28 11:49:02.000000000 +0200 @@ -25,6 +25,7 @@ Url: http://ccache.samba.org/ Source0: http://samba.org/ftp/ccache/%{name}-%{version}.tar.bz2 Patch1: xclang.patch +Patch2: ccache-gcc48.patch BuildRequires: zlib-devel Provides: distcc:/usr/bin/ccache BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,6 +38,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %configure ++++++ ccache-gcc48.patch ++++++ X-Git-Url: https://gitweb.samba.org/?p=ccache.git;a=blobdiff_plain;f=test.sh;h=3e383871... Index: ccache-3.1.9/test.sh =================================================================== --- ccache-3.1.9.orig/test.sh +++ ccache-3.1.9/test.sh @@ -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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org