rpms/ccache/EL-6 .cvsignore, 1.3, 1.4 ccache.csh.in, 1.1, 1.2 ccache.sh.in, 1.1, 1.2 ccache.spec, 1.25, 1.26 sources, 1.3, 1.4 06_md.diff, 1.1, NONE ccache-2.4-coverage-231462.patch, 1.1, NONE ccache-2.4-hardlink-doc.patch, 1.1, NONE ccache-2.4-noHOME-315441.patch, 1.1, NONE ccache-html-links.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Sat Jul 3 12:14:23 UTC 2010
Author: scop
Update of /cvs/pkgs/rpms/ccache/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16537
Modified Files:
.cvsignore ccache.csh.in ccache.sh.in ccache.spec sources
Removed Files:
06_md.diff ccache-2.4-coverage-231462.patch
ccache-2.4-hardlink-doc.patch ccache-2.4-noHOME-315441.patch
ccache-html-links.patch
Log Message:
* Sat Jul 3 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-1
- Update to 3.0, no-strip patch no longer needed.
* Fri Jun 4 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.2.pre1
- Reintroduce minor profile.d script performance improvements.
* Thu May 13 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.1.pre1
- Update to 3.0pre1 (#591040), license changed to GPLv3+.
* Mon Mar 1 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.1.pre0
- Update to 3.0pre0, all old patches applied/superseded upstream.
Note: old caches will no longer be used, see NEWS for details.
- Don't use "pathmunge" in the profile.d sh script to work around #548960.
- Patch to avoid stripping the binary during build.
- Add auto-symlink support for gcc44(-c++) and msp430-gcc.
- Run test suite during build.
- Update description.
* Sat Dec 19 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.4-17
- Minor profile.d script performance improvements.
- Fix hardcoded /var/cache/ccache in profile.d scripts.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:08:19 -0000 1.3
+++ .cvsignore 3 Jul 2010 12:14:22 -0000 1.4
@@ -1 +1 @@
-ccache-2.4.tar.gz
+ccache-3.0.tar.bz2
Index: ccache.csh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/EL-6/ccache.csh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ccache.csh.in 29 Jul 2007 22:38:31 -0000 1.1
+++ ccache.csh.in 3 Jul 2010 12:14:23 -0000 1.2
@@ -9,8 +9,8 @@ endif
# want that even if they have that write permission can set the CCACHE_DIR
# and unset the CCACHE_UMASK environment variables in their personal profile.
-if ( ! $?CCACHE_DIR && -d @CACHEDIR@ && -w @CACHEDIR@ ) then
- setenv CCACHE_DIR /var/cache/ccache
+if ( ! $?CCACHE_DIR && -w @CACHEDIR@ && -d @CACHEDIR@ ) then
+ setenv CCACHE_DIR @CACHEDIR@
setenv CCACHE_UMASK 002
unsetenv CCACHE_HARDLINK
endif
Index: ccache.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/EL-6/ccache.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ccache.sh.in 29 Jul 2007 22:38:31 -0000 1.1
+++ ccache.sh.in 3 Jul 2010 12:14:23 -0000 1.2
@@ -1,16 +1,17 @@
# Use ccache by default. Users who don't want that can set the CCACHE_DISABLE
# environment variable in their personal profile.
-if ! echo "$PATH" | grep -qw @LIBDIR@/ccache ; then
- PATH="@LIBDIR@/ccache:$PATH"
-fi
+case ":$PATH:" in
+ *:@LIBDIR@/ccache:*) ;;
+ *) PATH="@LIBDIR@/ccache:$PATH" ;;
+esac
# If @CACHEDIR@ is writable, use a shared cache there. Users who don't
# want that even if they have that write permission can set the CCACHE_DIR
# and unset the CCACHE_UMASK environment variables in their personal profile.
-if [ -z "$CCACHE_DIR" -a -d @CACHEDIR@ -a -w @CACHEDIR@ ] ; then
- export CCACHE_DIR=/var/cache/ccache
+if [ -z "$CCACHE_DIR" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
+ export CCACHE_DIR=@CACHEDIR@
export CCACHE_UMASK=002
unset CCACHE_HARDLINK
fi
Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/EL-6/ccache.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ccache.spec 10 Aug 2009 17:43:51 -0000 1.25
+++ ccache.spec 3 Jul 2010 12:14:23 -0000 1.26
@@ -1,49 +1,42 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++
-%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, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 gcc44 g++44 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++ msp430-gcc
+%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++, gcc44, gcc44-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++, msp430-gcc
%define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2
%{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
Name: ccache
-Version: 2.4
-Release: 16%{?dist}
+Version: 3.0
+Release: 1%{?dist}
Summary: C/C++ compiler cache
Group: Development/Tools
-License: GPLv2+
+License: GPLv3+
URL: http://ccache.samba.org/
-Source0: http://samba.org/ftp/ccache/%{name}-%{version}.tar.gz
+Source0: http://samba.org/ftp/ccache/%{name}-%{version}.tar.bz2
Source1: %{name}.sh.in
Source2: %{name}.csh.in
-Patch0: %{name}-html-links.patch
-Patch1: %{name}-2.4-coverage-231462.patch
-Patch2: %{name}-2.4-hardlink-doc.patch
-Patch3: %{name}-2.4-noHOME-315441.patch
-Patch4: http://patch-tracking.debian.net/patch/series/dl/ccache/2.4-17/06_md.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(File::Spec)
+BuildRequires: zlib-devel >= 1.2.3
Requires(triggerin): coreutils
Requires(triggerpostun): coreutils
%description
-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
-a 5 to 10 times speedup in common compilations.
+ccache is a compiler cache. It speeds up recompilation of C/C++ code
+by caching previous compiles and detecting when the same compile is
+being done again. The main focus is to handle the GNU C/C++ compiler
+(GCC), but it may also work with compilers that mimic GCC good enough.
%prep
%setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
%{SOURCE1} > %{name}.sh
sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
%{SOURCE2} > %{name}.csh
+# Make sure system zlib is used
+rm -r zlib
%build
@@ -66,6 +59,10 @@ done
install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
+%check
+make check
+
+
%clean
rm -fr $RPM_BUILD_ROOT
@@ -73,7 +70,6 @@ rm -fr $RPM_BUILD_ROOT
%pre
getent group ccache >/dev/null || groupadd -r ccache || :
-
%triggerin -- %{pkgs}
for name in %{compilers} ; do
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
@@ -93,7 +89,7 @@ done
%files -f %{name}-%{version}.compilers
%defattr(-,root,root,-)
-%doc COPYING README web/*.html
+%doc COPYING NEWS.txt README.txt
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%{_bindir}/ccache
%dir %{_libdir}/ccache/
@@ -102,6 +98,28 @@ done
%changelog
+* Sat Jul 3 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-1
+- Update to 3.0, no-strip patch no longer needed.
+
+* Fri Jun 4 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.2.pre1
+- Reintroduce minor profile.d script performance improvements.
+
+* Thu May 13 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.1.pre1
+- Update to 3.0pre1 (#591040), license changed to GPLv3+.
+
+* Mon Mar 1 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.1.pre0
+- Update to 3.0pre0, all old patches applied/superseded upstream.
+ Note: old caches will no longer be used, see NEWS for details.
+- Don't use "pathmunge" in the profile.d sh script to work around #548960.
+- Patch to avoid stripping the binary during build.
+- Add auto-symlink support for gcc44(-c++) and msp430-gcc.
+- Run test suite during build.
+- Update description.
+
+* Sat Dec 19 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.4-17
+- Minor profile.d script performance improvements.
+- Fix hardcoded /var/cache/ccache in profile.d scripts.
+
* Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.4-16
- Switch #438201 patch URL to Debian patch tracking (original is MIA).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 8 Nov 2004 04:08:19 -0000 1.3
+++ sources 3 Jul 2010 12:14:23 -0000 1.4
@@ -1 +1 @@
-73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz
+213bd7420f913e4c926eeac9cd2dadf6 ccache-3.0.tar.bz2
--- 06_md.diff DELETED ---
--- ccache-2.4-coverage-231462.patch DELETED ---
--- ccache-2.4-hardlink-doc.patch DELETED ---
--- ccache-2.4-noHOME-315441.patch DELETED ---
--- ccache-html-links.patch DELETED ---
More information about the scm-commits
mailing list