Changeset 2168


Ignore:
Timestamp:
Mar 18, 2009, 3:47:08 PM (11 years ago)
Author:
bruno
Message:
  • Attempt to fix a bug with nosegneg optimized libs on RHEL, where some are still missing at restore time.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi/mindi

    r2167 r2168  
    283283        vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
    284284        echo "$vanilla_lib_name" >> $filelist
    285         resolved=$vanilla_lib_name
    286         echo "Adding $resolved to filelist" >> $LOGFILE
    287         resolved=`ReadAllLink $resolved`
    288         echo "Adding $resolved to filelist" >> $LOGFILE
     285        echo "Adding $vanilla_lib_name to filelist" >> $LOGFILE
    289286        mkdir -p $outdir$optimized_lib_name > /dev/null 2> /dev/null
    290287        rmdir $outdir$optimized_lib_name > /dev/null 2> /dev/null
    291         ln -sf $vanilla_lib_name $outdir$optimized_lib_name
    292         echo "Excluding $optimized_lib_name" >> $LOGFILE
    293         grep -Fvx "$optimized_lib_name" "$filelist" > $filelist.tmp
    294         echo "Replacing it with $vanilla_lib_name" >> $LOGFILE
    295         echo "$vanilla_lib_name" >> $filelist.tmp
    296         mv -f $filelist.tmp $filelist
     288
     289        # This may return multiple files
     290        for resolved in `ReadAllLink $vanilla_lib_name`; do
     291            echo "Adding as deps $resolved to filelist" >> $LOGFILE
     292            vanilla_resolved_name=`echo "$resolved" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
     293            mkdir -p $outdir$resolved> /dev/null 2> /dev/null
     294            rmdir $outdir$resolved > /dev/null 2> /dev/null
     295            ln -sf $vanilla_resolved_name $outdir$resolved
     296            echo "Excluding deps $resolved" >> $LOGFILE
     297            grep -Fvx "$resolved" "$filelist" > $filelist.tmp
     298            echo "Replacing it with $vanilla_resolved_name" >> $LOGFILE
     299            echo "$vanilla_resolved_name" >> $filelist.tmp
     300            mv -f $filelist.tmp $filelist
     301        done
    297302    done
    298303    $AWK '{ print $1; }' $filelist | sort -u > $filelist.tmp
Note: See TracChangeset for help on using the changeset viewer.