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 09:15:08
Branch: HEAD Handle: 2005072408150800
Modified files:
openpkg-src/gcc gcc.spec
Log:
make post-adjustments more deterministically by first moving then then
removing. This way the order of the partly nested directories do not
matter any more.
Summary:
Revision Changes Path
1.111 +5 -1 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.110 -r1.111 gcc.spec
--- openpkg-src/gcc/gcc.spec 7 Jul 2005 08:28:02 -0000 1.110
+++ openpkg-src/gcc/gcc.spec 24 Jul 2005 07:15:08 -0000 1.111
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20050707
+Release: 20050724
# package options
%option with_cxx yes
@@ -246,11 +246,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]
