diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-12-11 08:51:54 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-12-11 08:51:54 +0200 |
| commit | c68860f056ce6bb122b8fac469d07414e8caefdf (patch) | |
| tree | 3f7258164a84df4576718224746d32410b1ddfc1 | |
| parent | 6a779c394b9ed70f7d7b45716b207ebae170f732 (diff) | |
| download | rpm-c68860f056ce6bb122b8fac469d07414e8caefdf.tar.gz rpm-c68860f056ce6bb122b8fac469d07414e8caefdf.tar.bz2 rpm-c68860f056ce6bb122b8fac469d07414e8caefdf.zip | |
OS X Leopard fixes from Giulio Eulisse
| -rw-r--r-- | autodeps/darwin.prov | 2 | ||||
| -rw-r--r-- | rpmio/fts.c | 2 | ||||
| -rw-r--r-- | rpmio/fts.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/autodeps/darwin.prov b/autodeps/darwin.prov index 5064414be..b068912a3 100644 --- a/autodeps/darwin.prov +++ b/autodeps/darwin.prov @@ -5,7 +5,7 @@ # This script reads filenames from STDIN and outputs any relevant provides # information that needs to be included in the package. -filelist=$(sed -n -e '/\.dylib/p' -e '/\.so/p' -e '/\.bundle/p' | sort | uniq | xargs file -L 2>/dev/null | grep "Mach-O.*ppc" | cut -d: -f1) +filelist=$(sed -n -e '/\.dylib/p' -e '/\.so/p' -e '/\.bundle/p' | sort | uniq | xargs file -L 2>/dev/null | grep "Mach-O.*\(ppc\|i386\)" | cut -d: -f1) for f in $filelist; do libname=$(basename $f | sed -e 's;\..*;;') diff --git a/rpmio/fts.c b/rpmio/fts.c index 7c34700a6..325e1a91f 100644 --- a/rpmio/fts.c +++ b/rpmio/fts.c @@ -58,9 +58,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif #if defined(__APPLE__) # define __errno_location() (__error()) -# define stat64 stat # define _STAT_VER 0 -# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp)) #endif #include "system.h" #include "rpmio/fts.h" diff --git a/rpmio/fts.h b/rpmio/fts.h index 09e675b11..a05c2d554 100644 --- a/rpmio/fts.h +++ b/rpmio/fts.h @@ -56,7 +56,7 @@ #endif #if defined(__APPLE__) -# define _D_EXACT_NAMLEN(d) ((d)->d_reclen) +# define _D_EXACT_NAMLEN(d) (strlen((d)->d_name)) #endif #endif |