Attachment 271341 Details for Bug 402881 – teach ccache about icecream

[patch] teach ccache about icecream

ccache-play-with-icecream.patch (text/plain), 2.48 KB, created by Michal Schmidt on 2007-11-28 14:50:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Schmidt

Created: 2007-11-28 14:50:47 UTC

Size: 2.48 KB

patch

obsolete

>diff -Nurp devel/ccache-call-compiler.in devel.mmm/ccache-call-compiler.in
>--- devel/ccache-call-compiler.in	1970-01-01 01:00:00.000000000 +0100
>+++ devel.mmm/ccache-call-compiler.in	2007-11-28 13:04:35.000000000 +0100
>@@ -0,0 +1,10 @@
>+#!/bin/bash
>+# This is meant to be called via symlinks
>+
>+PATH=@BINDIR@:$PATH
>+[ -x @BINDIR@/icecc ] && PATH=@LIBDIR@/icecc/bin:$PATH
>+
>+# basename of our name
>+compiler=${0##*/}
>+
>+@BINDIR@/ccache $compiler "$@"
>diff -Nurp devel/ccache.spec devel.mmm/ccache.spec
>--- devel/ccache.spec	2007-11-28 14:19:48.000000000 +0100
>+++ devel.mmm/ccache.spec	2007-11-28 14:22:17.000000000 +0100
>@@ -15,6 +15,7 @@ URL:            http://ccache.samba.org/
> Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.gz
> Source1:        %{name}.sh.in
> Source2:        %{name}.csh.in
>+Source3:        %{name}-call-compiler.in
> Patch0:         %{name}-html-links.patch
> Patch1:         %{name}-2.4-coverage-231462.patch
> Patch2:         %{name}-2.4-hardlink-doc.patch
>@@ -42,6 +43,8 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@
>     %{SOURCE1} > %{name}.sh
> sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
>     %{SOURCE2} > %{name}.csh
>+sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@BINDIR@|%{_bindir}|g' \
>+    %{SOURCE3} > %{name}-call-compiler
> 
> 
> %build
>@@ -55,9 +58,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
> install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
> install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
> install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
>+install -pm 755 %{name}-call-compiler $RPM_BUILD_ROOT%{_libdir}/ccache
> for name in %{compilers} ; do
>   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
>-    ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$c
>+    ln -s %{name}-call-compiler $RPM_BUILD_ROOT%{_libdir}/ccache/$c
>     echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
>   done
> done
>@@ -75,7 +79,7 @@ getent group ccache >/dev/null || groupa
> %triggerin -- %{pkgs}
> for name in %{compilers} ; do
>   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
>-    [ ! -x %{_bindir}/$c ] || ln -sf %{relccache} %{_libdir}/ccache/$c
>+    [ ! -x %{_bindir}/$c ] || ln -sf %{name}-call-compiler %{_libdir}/ccache/$c
>   done
> done
> :
>@@ -95,6 +99,7 @@ done
> %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
> %{_bindir}/ccache
> %dir %{_libdir}/ccache/
>+%{_libdir}/ccache/%{name}-call-compiler
> %attr(2770,root,ccache) %dir %{_var}/cache/ccache/
> %{_mandir}/man1/ccache.1*
>

Actions: View | Diff

Attachments on bug 402881: 271341