diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-06-06 02:23:35 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-06-06 02:23:35 +0000 |
| commit | 9c3ef1bdbb7be1e5aca002af63ae73a8f7a0ee65 (patch) | |
| tree | 0d03206112d9219da92fb80bb1f96458d9551313 | |
| parent | 281c8277a7b639baa22f5c42d38427c6d2cf1a63 (diff) | |
| download | rpm-setup-9c3ef1bdbb7be1e5aca002af63ae73a8f7a0ee65.tar rpm-setup-9c3ef1bdbb7be1e5aca002af63ae73a8f7a0ee65.tar.gz rpm-setup-9c3ef1bdbb7be1e5aca002af63ae73a8f7a0ee65.tar.bz2 rpm-setup-9c3ef1bdbb7be1e5aca002af63ae73a8f7a0ee65.tar.xz rpm-setup-9c3ef1bdbb7be1e5aca002af63ae73a8f7a0ee65.zip | |
- merge from old ppc64 branch:
* find-requires: handle ppc64 loaders
| -rwxr-xr-x | find-requires.in | 2 | ||||
| -rw-r--r-- | rpm-mandriva-setup.spec | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/find-requires.in b/find-requires.in index ca09eaa..9038276 100755 --- a/find-requires.in +++ b/find-requires.in @@ -179,7 +179,7 @@ for i in `echo $filelist | tr '[:blank:]' "\n" | egrep "(/usr(/X11R6)?)?/lib(|64 lib64=`if file -L $i 2>/dev/null | grep "ELF 64-bit" >/dev/null; then echo "(64bit)"; fi` && \ [ -h ${i} -a -n "${objd}" ] && \ ldd ${i} \ - | grep -v "/\(lib\|lib64\)/ld-linux.*\.so" \ + | grep -v "/\(lib\|lib64\)/\(ld\|ld64\|ld-linux.*\)\.so" \ | perl -p -e "s/\s+(\S+)\.so.*/devel(\1$lib64)/g" done | egrep -v 'devel\(linux-gate|lib(c|pthread|rt)(\(64bit\))?\)' | sort -u diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec index 09e1f21..451bea3 100644 --- a/rpm-mandriva-setup.spec +++ b/rpm-mandriva-setup.spec @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +- merge from old ppc64 branch: + * find-requires: handle ppc64 loaders + * Wed May 25 2005 Olivier Thauvin <nanardon@zarb.org> 1.0-1mdk - 1.0: - disable automatic gpg key query on server |