- Drop "bin" from compiler symlink path.
- Make profile.d snippets non-executable (#35714).
This commit is contained in:
parent
8c0d504aa1
commit
1cfe064904
31
ccache.spec
31
ccache.spec
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: ccache
|
Name: ccache
|
||||||
Version: 2.4
|
Version: 2.4
|
||||||
Release: 3
|
Release: 4%{?dist}
|
||||||
Summary: C/C++ compiler cache
|
Summary: C/C++ compiler cache
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -14,9 +14,9 @@ Patch0: %{name}-html-links.patch
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
%description
|
%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
|
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.
|
a 5 to 10 times speedup in common compilations.
|
||||||
|
|
||||||
|
|
||||||
@ -29,13 +29,13 @@ a 5 to 10 times speedup in common compilations.
|
|||||||
%configure
|
%configure
|
||||||
%{__make} %{?_smp_mflags}
|
%{__make} %{?_smp_mflags}
|
||||||
cat <<EOF > %{name}.sh
|
cat <<EOF > %{name}.sh
|
||||||
if ! echo "\$PATH" | grep -q %{_libdir}/ccache/bin ; then
|
if ! echo "\$PATH" | grep -q %{_libdir}/ccache ; then
|
||||||
PATH="%{_libdir}/ccache/bin:\$PATH"
|
PATH="%{_libdir}/ccache:\$PATH"
|
||||||
fi
|
fi
|
||||||
EOF
|
EOF
|
||||||
cat <<EOF > %{name}.csh
|
cat <<EOF > %{name}.csh
|
||||||
if ( "\$path" !~ *%{_libdir}/ccache/bin* ) then
|
if ( "\$path" !~ *%{_libdir}/ccache* ) then
|
||||||
set path = ( %{_libdir}/ccache/bin \$path )
|
set path = ( %{_libdir}/ccache \$path )
|
||||||
endif
|
endif
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
@ -44,12 +44,12 @@ EOF
|
|||||||
rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
|
rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||||
install -pm 755 %{name}.sh %{name}.csh $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/bin
|
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
|
||||||
for name in %{compilers} ; do
|
for name in %{compilers} ; do
|
||||||
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
|
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
|
||||||
ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin/$c
|
ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/$c
|
||||||
echo "%ghost %{_libdir}/ccache/bin/$c" >> %{name}-%{version}.compilers
|
echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -61,14 +61,14 @@ rm -fr $RPM_BUILD_ROOT
|
|||||||
%triggerin -- %{pkgs}
|
%triggerin -- %{pkgs}
|
||||||
for name in %{compilers} ; do
|
for name in %{compilers} ; do
|
||||||
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; 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
|
||||||
done
|
done
|
||||||
|
|
||||||
%triggerpostun -- %{pkgs}
|
%triggerpostun -- %{pkgs}
|
||||||
for name in %{compilers} ; do
|
for name in %{compilers} ; do
|
||||||
for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; 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
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -79,11 +79,14 @@ done
|
|||||||
%config %{_sysconfdir}/profile.d/%{name}.*sh
|
%config %{_sysconfdir}/profile.d/%{name}.*sh
|
||||||
%{_bindir}/ccache
|
%{_bindir}/ccache
|
||||||
%dir %{_libdir}/ccache
|
%dir %{_libdir}/ccache
|
||||||
%dir %{_libdir}/ccache/bin
|
|
||||||
%{_mandir}/man1/ccache.1*
|
%{_mandir}/man1/ccache.1*
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* 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
|
- Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
|
||||||
bunch of no longer relevant compilers.
|
bunch of no longer relevant compilers.
|
||||||
|
Loading…
Reference in New Issue
Block a user