pool/ccache
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 180816 from home:pgajdos

Browse Source 
- fixed build with gcc 4.8
  * ccache-gcc48.patch

OBS-URL: https://build.opensuse.org/request/show/180816
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ccache?expand=0&rev=32
This commit is contained in:
Dirk Mueller 2013-06-25 11:14:28 +00:00 committed by Git OBS Bridge
parent 60141c1530
commit 8ca088b04e
3 changed files with 169 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
ccache-gcc48.patch Normal file
View File

@ -0,0 +1,161 @@
X-Git-Url: https://gitweb.samba.org/?p=ccache.git;a=blobdiff_plain;f=test.sh;h=3e3838712aecb402b89bd070b1c46c616e44a1c6;hp=3ed90697bf6ec0eb1a69e4affbb1cfe65a8d74cb;hb=b5d63f81c1a83fd4c50b769a96a04f581b7db70c;hpb=fd7d9b8d9aaaaacfa0eafe668bff4404b8efa5e9
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

6
ccache.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 25 08:44:41 UTC 2013 - pgajdos@suse.com
- fixed build with gcc 4.8
* ccache-gcc48.patch
-------------------------------------------------------------------
Sat Feb 23 20:55:27 UTC 2013 - asterios.dramis@gmail.com

2
ccache.spec
View File

@ -25,6 +25,7 @@ Group: Development/Languages/C and C++
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 @@ again. Supported languages are C, C++, Objective-C and Objective-C++.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
%configure