OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: rpm-src Date: 08-Jun-2005 15:16:27
Branch: HEAD Handle: 2005060814161907
Modified files:
rpm-src/OpenPKG do-assemble.cfg
rpm-src/lib getdate.c getdate.y
rpm-src/rpmio fts.c rpmrpc.c
Log:
even more AIX adjustments
Summary:
Revision Changes Path
1.10 +8 -0 rpm-src/OpenPKG/do-assemble.cfg
1.2 +54 -47 rpm-src/lib/getdate.c
1.2 +7 -3 rpm-src/lib/getdate.y
1.5 +7 -0 rpm-src/rpmio/fts.c
1.5 +2 -2 rpm-src/rpmio/rpmrpc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm-src/OpenPKG/do-assemble.cfg
============================================================================
$ cvs diff -u -r1.9 -r1.10 do-assemble.cfg
--- rpm-src/OpenPKG/do-assemble.cfg 24 Jan 2005 16:46:27 -0000 1.9
+++ rpm-src/OpenPKG/do-assemble.cfg 8 Jun 2005 13:16:19 -0000 1.10
@@ -113,6 +113,8 @@
PATCHED lib/rpmlib.h rpm.patch.feature
PATCHED rpmdb/tagtbl.c rpm.patch.feature
PATCHED build/parsePreamble.c:+,-3 rpm.patch.feature
+PATCHED lib/getdate.y rpm.patch.porting
+PATCHED lib/getdate.c rpm.patch.porting
COMMENT ltconfig {
Evil hack to get GNU libtool working under NetBSD 1.6
@@ -704,4 +706,10 @@
COMMENT build/parsePreamble.c:+,-3 {
Add support for "Class" header.
}
+COMMENT lib/getdate.y {
+ Workaround a double-inclusion problem under AIX.
+}
+COMMENT lib/getdate.c {
+ Workaround a double-inclusion problem under AIX.
+}
@@ .
patch -p0 <<'@@ .'
Index: rpm-src/lib/getdate.c
============================================================================
$ cvs diff -u -r1.1.1.4 -r1.2 getdate.c
--- rpm-src/lib/getdate.c 2 Jul 2003 19:21:45 -0000 1.1.1.4
+++ rpm-src/lib/getdate.c 8 Jun 2005 13:16:21 -0000 1.2
@@ -50,7 +50,9 @@
#undef static
#endif
+#ifndef OPENPKG_AIX
#include <stdio.h>
+#endif
#include <ctype.h>
/* The code at the top of get_date which figures out the offset of the
@@ .
patch -p0 <<'@@ .'
Index: rpm-src/lib/getdate.y
============================================================================
$ cvs diff -u -r1.1.1.2 -r1.2 getdate.y
--- rpm-src/lib/getdate.y 24 Sep 2001 21:53:15 -0000 1.1.1.2
+++ rpm-src/lib/getdate.y 8 Jun 2005 13:16:22 -0000 1.2
@@ -30,7 +30,9 @@
#undef static
#endif
+#ifndef OPENPKG_AIX
#include <stdio.h>
+#endif
#include <ctype.h>
/* The code at the top of get_date which figures out the offset of the
@@ .
patch -p0 <<'@@ .'
Index: rpm-src/rpmio/fts.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 fts.c
--- rpm-src/rpmio/fts.c 6 Jun 2005 15:53:06 -0000 1.4
+++ rpm-src/rpmio/fts.c 8 Jun 2005 13:16:25 -0000 1.5
@@ -83,6 +83,13 @@
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
#endif
+#if defined(OPENPKG_AIX)
+# define __errno_location() (&errno)
+# define _STAT_VER 0
+# define dirfd(dirp) ((dirp)->dd_fd)
+# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
+# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
+#endif
#include "system.h"
#include "fts.h"
#include "rpmio.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm-src/rpmio/rpmrpc.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 rpmrpc.c
--- rpm-src/rpmio/rpmrpc.c 6 Jun 2005 15:53:06 -0000 1.4
+++ rpm-src/rpmio/rpmrpc.c 8 Jun 2005 13:16:26 -0000 1.5
@@ -1122,7 +1122,7 @@
/[EMAIL PROTECTED]@*/
static int ftpmagicdir = 0x8440291;
-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
&& !defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN) &&
!defined(__osf__) && !defined(OPENPKG_IRIX64) && !defined(OPENPKG_HPUX)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
&& !defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN) &&
!defined(__osf__) && !defined(OPENPKG_IRIX64) && !defined(OPENPKG_HPUX) &&
!defined(OPENPKG_AIX)
#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
#else
@@ -1301,7 +1301,7 @@
strncpy(dp->d_name, av[i].name, sizeof(dp->d_name) - 1);
dp->d_name[sizeof(dp->d_name)-1] = '\0';
dp->d_namlen = strlen(dp->d_name);
-#elif defined(OPENPKG_HPUX) || defined(sun) || defined(OPENPKG_UNIXWARE) ||
defined(__osf__) || defined(OPENPKG_IRIX64)
+#elif defined(OPENPKG_HPUX) || defined(sun) || defined(OPENPKG_UNIXWARE) ||
defined(__osf__) || defined(OPENPKG_IRIX64) || defined(OPENPKG_AIX)
/* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
dp->d_ino = i + 1; /* W2DO? */
dp->d_reclen = 0; /* W2DO? */
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
