]> git.pld-linux.org Git - packages/rpm.git/commitdiff
Allow 64bit provides
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Mon, 17 Nov 2003 17:13:55 +0000 (17:13 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rpm-find-provides -> 1.3

rpm-find-provides

index 160c7a6a6c47c0d1474223dde74e69c72cf279bc..72e4a9b8e0d1dced0d9dc698a5f60b06c17f3116 100644 (file)
@@ -11,13 +11,21 @@ if [ -f __rpm_noautoprovfiles ] ; then
        done
 fi
 
+case `uname -m` in
+    alpha*)       mark64="" ;;
+    *)            mark64="()(64bit)" ;;
+esac
+    
 allprovides=`for f in $filelist; do
-    soname=$(objdump -p $f | awk '/SONAME/ {print $2}')
+    soname=$(objdump -p $f 2> /dev/null | awk '/SONAME/ {print $2}')
 
+    lib64=`if file -L $f 2>/dev/null | \
+       grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
+       
     if [ "$soname" != "" ]; then
         if [ ! -L $f ]; then
-            echo $soname
-           objdump -p $f | awk '
+            echo $soname$lib64
+           objdump -p $f 2> /dev/null | awk '
                BEGIN { START=0 ; }
                /Version definitions:/ { START=1; }
                /^[0-9]/ && (START==1) { print $4; }
@@ -25,11 +33,11 @@ allprovides=`for f in $filelist; do
            ' | \
                grep -v $soname | \
                while read symbol ; do
-                   echo "$soname($symbol)"
+                   echo "$soname($symbol)`echo $lib64 | sed 's/()//'`"
                done
        fi
     else
-       echo ${f##*/}
+       echo ${f##*/}$lib64
     fi
 done | sort -u`
 
This page took 0.057142 seconds and 4 git commands to generate.