From: Joe Buehler <aspam@cox.net>
Date: Mon, 3 Oct 2005 03:46:29 +0000 (+0000)
Subject: STABLE14-hpux-build-updates-20051002
X-Git-Tag: openafs-stable-1_4_0-rc6~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cb2c1d953ef427c86b3b10f79cf15f2a6cea30f4;p=packages%2Fo%2Fopenafs.git

STABLE14-hpux-build-updates-20051002

FIXES 21722

ndir.h has been changed. also, pthreads header doesn't match how we used it


(cherry picked from commit aee18ed884d2af05174594120ba1825bfe76c96a)
---

diff --git a/acinclude.m4 b/acinclude.m4
index 5816c496b..ed2884a07 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -180,6 +180,9 @@ case $system in
         *-hpux*)
 		MKAFS_OSTYPE=HPUX
                 AC_MSG_RESULT(hp_ux)
+		if test -f "/usr/old/usr/include/ndir.h"; then
+		 AC_DEFINE(HAVE_USR_OLD_USR_INCLUDE_NDIR_H, 1, [define if you have old ndir.h])
+		fi
                 ;;
         *-irix*)
 		if test -d /usr/include/sys/SN/SN1; then
@@ -902,6 +905,11 @@ fi
 if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
 fi
+if test "x$PTHREAD_LIBS" = xerror; then
+        # pthread_attr_init is a macro under HPUX 11.0 and 11.11
+        AC_CHECK_LIB(pthread, pthread_attr_destroy,
+                PTHREAD_LIBS="-lpthread")
+fi
 if test "x$PTHREAD_LIBS" = xerror; then
         AC_MSG_WARN(*** Unable to locate working posix thread library ***)
 fi
diff --git a/src/afs/VNOPS/afs_vnop_readdir.c b/src/afs/VNOPS/afs_vnop_readdir.c
index a7a3e8733..8cfcae7ed 100644
--- a/src/afs/VNOPS/afs_vnop_readdir.c
+++ b/src/afs/VNOPS/afs_vnop_readdir.c
@@ -580,8 +580,9 @@ afs_readdir(OSI_VC_ARG(avc), auio, acred)
 #if defined(AFS_SGI53_ENV)
     afs_int32 use64BitDirent, dirsiz;
 #endif /* defined(AFS_SGI53_ENV) */
+#ifndef	AFS_HPUX_ENV
     OSI_VC_CONVERT(avc);
-#ifdef	AFS_HPUX_ENV
+#else
     /*
      * XXX All the hacks for alloced sdirEntry and inlining of afs_readdir_move instead of calling
      * it is necessary for hpux due to stack problems that seem to occur when coming thru the nfs
diff --git a/src/vfsck/dir.c b/src/vfsck/dir.c
index d9e54d462..29792eb52 100644
--- a/src/vfsck/dir.c
+++ b/src/vfsck/dir.c
@@ -64,7 +64,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define	DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #define KERNEL
 #include <sys/dir.h>
diff --git a/src/vfsck/inode.c b/src/vfsck/inode.c
index 253f3024b..c93e4513e 100644
--- a/src/vfsck/inode.c
+++ b/src/vfsck/inode.c
@@ -62,7 +62,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define	DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #include <sys/dir.h>
 #endif
diff --git a/src/vfsck/main.c b/src/vfsck/main.c
index 5ce904ed0..ee034f2d4 100644
--- a/src/vfsck/main.c
+++ b/src/vfsck/main.c
@@ -70,7 +70,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define	DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #define KERNEL
 #include <sys/dir.h>
diff --git a/src/vfsck/pass2.c b/src/vfsck/pass2.c
index d35c5f6fc..59f4524f2 100644
--- a/src/vfsck/pass2.c
+++ b/src/vfsck/pass2.c
@@ -60,7 +60,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define	DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #include <sys/dir.h>
 #endif
diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c
index c9be6e01a..27ea70706 100644
--- a/src/vfsck/utilities.c
+++ b/src/vfsck/utilities.c
@@ -62,7 +62,11 @@ RCSID
 #include <sys/ino.h>
 #include <sys/signal.h>
 #define	DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #include <sys/dir.h>
 #endif
diff --git a/src/vfsck/vprintf.c b/src/vfsck/vprintf.c
index 9748cda91..849451d26 100644
--- a/src/vfsck/vprintf.c
+++ b/src/vfsck/vprintf.c
@@ -71,7 +71,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define	DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #define KERNEL
 #include <sys/dir.h>