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: 24-Jul-2005 10:47:47
Branch: HEAD Handle: 2005072409474700
Modified files:
openpkg-src/gcc40 gcc40.spec
Log:
make post-adjustments more deterministically by first moving then
removing. This way the order of the partly nested directories do not
matter any more.
Summary:
Revision Changes Path
1.37 +4 -0 openpkg-src/gcc40/gcc40.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc40/gcc40.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 gcc40.spec
--- openpkg-src/gcc40/gcc40.spec 24 Jul 2005 08:27:40 -0000 1.36
+++ openpkg-src/gcc40/gcc40.spec 24 Jul 2005 08:47:47 -0000 1.37
@@ -242,11 +242,15 @@
# cleanup installation tree
mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/
+ 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/
+ dirs="$dirs $subdir"
+ done
+ for subdir in $dirs; do
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir
done
mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
