Compare commits
16 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
edc6a21c76 | ||
|
8f3be45c50 | ||
|
04e4b2be28 | ||
|
2920c76a38 | ||
|
e3ced69f45 | ||
|
f2e9e61391 | ||
|
43358d3c48 | ||
|
21bceb514d | ||
|
3282e57804 | ||
|
1cfe064904 | ||
|
8c0d504aa1 | ||
|
0907fe96a9 | ||
|
0f15e4284e | ||
|
d2af959078 | ||
|
5b6066d6c1 | ||
|
40d624139b |
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: ccache
|
||||
# $Id$
|
||||
NAME := ccache
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
12
ccache-2.4-coverage-231462.patch
Normal file
12
ccache-2.4-coverage-231462.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- ccache.c~ 2004-09-13 13:38:30.000000000 +0300
|
||||
+++ ccache.c 2007-03-15 12:31:41.000000000 +0200
|
||||
@@ -640,6 +640,9 @@
|
||||
|
||||
/* these are too hard */
|
||||
if (strcmp(argv[i], "-fbranch-probabilities")==0 ||
|
||||
+ strcmp(argv[i], "--coverage") == 0 ||
|
||||
+ strcmp(argv[i], "-fprofile-arcs") == 0 ||
|
||||
+ strcmp(argv[i], "-ftest-coverage") == 0 ||
|
||||
strcmp(argv[i], "-M") == 0 ||
|
||||
strcmp(argv[i], "-MM") == 0 ||
|
||||
strcmp(argv[i], "-x") == 0) {
|
88
ccache.spec
88
ccache.spec
@ -1,42 +1,46 @@
|
||||
%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 kgcc egcs egcs++ gcc3 g++3 gcc-ssa g++-ssa gcc34 c++34 g++34 gcc33 c++33 g++33 gcc4 g++4 c++4
|
||||
%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, gcc32, gcc3, gcc3-c++, kgcc, compat-egcs, compat-egcs-c++, egcs, egcs-c++, gcc-ssa, gcc-c++-ssa, gcc34, gcc34-c++, gcc4, gcc4-c++
|
||||
%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7
|
||||
%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel
|
||||
|
||||
Name: ccache
|
||||
Version: 2.4
|
||||
Release: 0.fdr.1.2
|
||||
Epoch: 0
|
||||
Summary: Compiler cache
|
||||
Name: ccache
|
||||
Version: 2.4
|
||||
Release: 8%{?dist}
|
||||
Summary: C/C++ compiler cache
|
||||
|
||||
Group: Development/Tools
|
||||
License: GPL
|
||||
URL: http://ccache.samba.org/
|
||||
Source0: http://ccache.samba.org/ftp/ccache/ccache-2.4.tar.gz
|
||||
Group: Development/Tools
|
||||
License: GPL
|
||||
URL: http://ccache.samba.org/
|
||||
Source0: http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
|
||||
Patch0: %{name}-html-links.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Patch1: %{name}-2.4-coverage-231462.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Requires(triggerin): coreutils
|
||||
Requires(triggerpostun): coreutils
|
||||
|
||||
%description
|
||||
ccache is a compiler cache. It acts as a caching pre-processor to
|
||||
ccache is a compiler cache. It acts as a caching pre-processor to
|
||||
C/C++ compilers, using the -E compiler switch and a hash to detect
|
||||
when a compilation can be satisfied from cache. This often results in
|
||||
when a compilation can be satisfied from cache. This often results in
|
||||
a 5 to 10 times speedup in common compilations.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
|
||||
|
||||
%build
|
||||
%configure
|
||||
%{__make} %{?_smp_mflags}
|
||||
cat <<EOF > %{name}.sh
|
||||
if ! echo "\$PATH" | grep -q %{_libdir}/ccache/bin ; then
|
||||
PATH="%{_libdir}/ccache/bin:\$PATH"
|
||||
if ! echo "\$PATH" | grep -q %{_libdir}/ccache ; then
|
||||
PATH="%{_libdir}/ccache:\$PATH"
|
||||
fi
|
||||
EOF
|
||||
cat <<EOF > %{name}.csh
|
||||
if ( "\$path" !~ *%{_libdir}/ccache/bin* ) then
|
||||
set path = ( %{_libdir}/ccache/bin \$path )
|
||||
if ( "\$path" !~ *%{_libdir}/ccache* ) then
|
||||
set path = ( %{_libdir}/ccache \$path )
|
||||
endif
|
||||
EOF
|
||||
|
||||
@ -45,12 +49,12 @@ EOF
|
||||
rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
install -pm 755 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache/bin
|
||||
install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
|
||||
for name in %{compilers} ; do
|
||||
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
|
||||
ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin/$c
|
||||
echo "%ghost %{_libdir}/ccache/bin/$c" >> %{name}-%{version}.compilers
|
||||
ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/$c
|
||||
echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
|
||||
done
|
||||
done
|
||||
|
||||
@ -62,14 +66,14 @@ rm -fr $RPM_BUILD_ROOT
|
||||
%triggerin -- %{pkgs}
|
||||
for name in %{compilers} ; do
|
||||
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
|
||||
[ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/bin/$c
|
||||
[ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/$c
|
||||
done
|
||||
done
|
||||
|
||||
%triggerpostun -- %{pkgs}
|
||||
for name in %{compilers} ; do
|
||||
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
|
||||
[ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/bin/$c
|
||||
[ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/$c
|
||||
done
|
||||
done
|
||||
|
||||
@ -79,12 +83,36 @@ done
|
||||
%doc COPYING README web/*.html
|
||||
%config %{_sysconfdir}/profile.d/%{name}.*sh
|
||||
%{_bindir}/ccache
|
||||
%dir %{_libdir}/ccache
|
||||
%dir %{_libdir}/ccache/bin
|
||||
%dir %{_libdir}/ccache/
|
||||
%{_mandir}/man1/ccache.1*
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-8
|
||||
- Bypass cache with --coverage, -fprofile-arcs and -ftest-coverage
|
||||
(upstream CVS and Matt Fago, #231462).
|
||||
|
||||
* Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-7
|
||||
- Require coreutils for triggers (#215030).
|
||||
|
||||
* Wed Aug 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-6
|
||||
- Add auto-symlink support for compat-gcc-34(-c++).
|
||||
- Untabify, escape macros in changelog.
|
||||
|
||||
* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-5
|
||||
- Add auto-symlink support for g++-libstdc++-so_7.
|
||||
|
||||
* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
|
||||
- Drop "bin" from compiler symlink path.
|
||||
- Make profile.d snippets non-executable (#35714).
|
||||
|
||||
* Sun May 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-3
|
||||
- Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
|
||||
bunch of no longer relevant compilers.
|
||||
|
||||
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
|
||||
- rebuilt
|
||||
|
||||
* Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
|
||||
- Update to 2.4.
|
||||
- Add symlinking support for gcc4 and gcc4-c++.
|
||||
@ -126,7 +154,7 @@ done
|
||||
- Add Requires: gcc, gcc-c++ (minimal expectation of compilers)
|
||||
|
||||
* Fri Mar 28 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.3
|
||||
- No longer use %ghost, symlinks always exist
|
||||
- No longer use %%ghost, symlinks always exist
|
||||
|
||||
* Thu Mar 27 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.2
|
||||
- Move symlinks to /usr/lib/ccache/bin
|
||||
@ -136,7 +164,7 @@ done
|
||||
* Thu Mar 27 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.1
|
||||
- Move symlinks to /bin since it seems to be at the beginning of PATH of all users
|
||||
before /usr/bin, the location of the real compiler.
|
||||
- Package symlinks rather than create and remove during %post and %postun
|
||||
- Package symlinks rather than create and remove during %%post and %%postun
|
||||
|
||||
* Thu Feb 20 2003 Warren Togami <warren@togami.com> 2.2-4.fedora.1
|
||||
- Fedora
|
||||
@ -152,8 +180,8 @@ done
|
||||
- Upgraded to ccache 2.2
|
||||
|
||||
* Tue Feb 04 2003 Samir M. Nassar <rpm@redconcepts.net> 2.1.1-4.redconcepts
|
||||
- Using %post to create the soft symlinks
|
||||
- Using %postun to remove the soft symlinks
|
||||
- Using %%post to create the soft symlinks
|
||||
- Using %%postun to remove the soft symlinks
|
||||
- Thanks to Che <che666@uni.de> for the help
|
||||
- Packaged as user
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user