OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-May-2007 07:56:08
Branch: HEAD Handle: 2007052306560800
Modified files:
openpkg-src/gcc gcc.spec
Log:
do not insist that all directories exists on all platforms when moving
around files
Summary:
Revision Changes Path
1.141 +6 -4 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.140 -r1.141 gcc.spec
--- openpkg-src/gcc/gcc.spec 17 May 2007 10:18:56 -0000 1.140
+++ openpkg-src/gcc/gcc.spec 23 May 2007 05:56:08 -0000 1.141
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20070517
+Release: 20070523
# package options
%option with_cxx yes
@@ -250,17 +250,19 @@
# cleanup installation tree
mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/ \
+ >/dev/null 2>&1 || true
dirs=""
for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`;
do
subdir=`echo "$multilib" | sed -e 's/;.*$//'`
[ ".$subdir" = .. ] && continue
mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/
+
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/ \
+ >/dev/null 2>&1 || true
dirs="$dirs $subdir"
done
for subdir in $dirs; do
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir >/dev/null 2>&1 || true
done
mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/include/
\
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
