[Fedora-directory-commits] adminutil nsarch, 1.3, 1.4 nsconfig.mk, 1.5, 1.6

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10606

Modified Files:
	nsarch nsconfig.mk 
Log Message:
[172166] Admin Util build (IPF)
Supporting build on HP-UX IPF.



Index: nsarch
===================================================================
RCS file: /cvs/dirsec/adminutil/nsarch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsarch	16 Dec 2005 18:15:59 -0000	1.3
+++ nsarch	19 Jan 2006 22:05:52 -0000	1.4
@@ -451,6 +451,14 @@
         NS_RELEASE="${HPUX_REV}"
         ns_printf
 	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	GNU_NAME="${UNAME_MACHINE}-hp-hpux${HPUX_REV}"
+        NS_NAME="HPUX"
+        NS_PRETTY_NAME="HP-UX"
+        NS_RELEASE="${HPUX_REV}"
+        ns_printf
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	sed 's/^	//' << EOF >dummy.c
 	#include <unistd.h>


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsconfig.mk	15 Dec 2005 21:06:22 -0000	1.5
+++ nsconfig.mk	19 Jan 2006 22:05:52 -0000	1.6
@@ -175,15 +175,26 @@
 ifeq ($(NSOS_RELEASE), B.11.11)
     MODERNHP=1
 endif
+ifeq ($(NSOS_RELEASE), B.11.23)
+    MODERNHP=1
+endif
 
 ifeq ($(MODERNHP), 1)
 CC=cc -Ae +ESlit
 CXX=/opt/aCC/bin/aCC
-ifeq ($(USE_64), 1)
-BIT_SWITCH=+DA2.0W +DS2.0
-else
-BIT_SWITCH=+DAportable +DS1.1
-endif
+ifeq ($(NSOS_RELEASE), B.11.23)
+  ifeq ($(USE_64), 1)
+    BIT_SWITCH=+DD64
+  else
+    BIT_SWITCH=+DD32
+  endif
+else # 11.11 or earlier
+  ifeq ($(USE_64), 1)
+    BIT_SWITCH=+DA2.0W +DS2.0
+  else
+    BIT_SWITCH=+DAportable +DS1.1
+  endif
+endif # B.11.23
 ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11
 EXTRA_LIBS= -ldld -lm -lpthread
 else