[Fedora-directory-commits] setuputil nsarch, 1.3, 1.4 nsconfig.mk, 1.3, 1.4

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13522

Modified Files:
    nsarch nsconfig.mk 
Log Message:
Supporting build on HP-UX IPF.

Index: nsarch
===================================================================
RCS file: /cvs/dirsec/setuputil/nsarch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsarch	16 Dec 2005 18:14:26 -0000	1.3
+++ nsarch	19 Jan 2006 23:10:03 -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/setuputil/nsconfig.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsconfig.mk	16 Dec 2005 01:07:52 -0000	1.3
+++ nsconfig.mk	19 Jan 2006 23:10:03 -0000	1.4
@@ -206,7 +206,12 @@
 #-------------------
 ifeq ($(ARCH), HPUX)
 #-------------------
-DLL_SUFFIX=sl
+HPUX_ARCH = $(shell uname -m)
+ifeq ($(HPUX_ARCH), ia64)
+    DLL_SUFFIX=so
+else
+    DLL_SUFFIX=sl
+endif
 LDAP_DLL_SUFFIX=$(DLL_SUFFIX)

ifeq ($(NSOS_RELEASE), B.11.00)
@@ -215,16 +220,27 @@
 ifeq ($(NSOS_RELEASE), B.11.11)
    MODERNHP=1
 endif
+ifeq ($(NSOS_RELEASE), B.11.23)
+	MODERNHP=1
+endif

ifdef MODERNHP
 CC=cc -Ae +ESlit
 CXX=aCC
-ifeq ($(USE_64), 1)
-BIT_SWITCH=+DA2.0W +DS2.0 -DHPUX_64 -Wl,+s
-else
-BIT_SWITCH=+DAportable +DS1.1 -Wl,+s
-endif
-ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11
+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
 CC=cc
@@ -232,6 +248,10 @@
 EXTRA_LIBS= -ldld -lm -ldce
 endif

+ifeq ($(USE_64), 1)
+  ARCH_CFLAGS+=-DHPUX_64
+endif
+
 CCC=$(CXX)

ARCH_DEBUG=-g