Browse Source

do not insist that all directories exists on all platforms when moving around files

Ralf S. Engelschall 18 years ago
parent
commit
96a51841ff
1 changed files with 6 additions and 4 deletions
  1. 6 4
      gcc/gcc.spec

+ 6 - 4
gcc/gcc.spec

@@ -37,7 +37,7 @@ Class:        CORE
 Group:        Compiler
 Group:        Compiler
 License:      GPL
 License:      GPL
 Version:      %{V_full}
 Version:      %{V_full}
-Release:      20070517
+Release:      20070523
 
 
 #   package options
 #   package options
 %option       with_cxx       yes
 %option       with_cxx       yes
@@ -250,17 +250,19 @@ AutoReqProv:  no
 
 
     #   cleanup installation tree
     #   cleanup installation tree
     mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
     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=""
     dirs=""
     for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do
     for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do
         subdir=`echo "$multilib" | sed -e 's/;.*$//'`
         subdir=`echo "$multilib" | sed -e 's/;.*$//'`
         [ ".$subdir" = .. ] && continue
         [ ".$subdir" = .. ] && continue
         mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \
         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"
         dirs="$dirs $subdir"
     done
     done
     for subdir in $dirs; do
     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
     done
     mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
     mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
        $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/include/ \
        $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/include/ \