Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14188
Modified Files:
component_versions.mk components.mk nsconfig.mk
pkgadminutil.mk
Log Message:
[Bug 172166] Admin Util build (IPF)
1) Ported onto HP-UX IPF (B.11.23).
2) Upgraded ICU version from 2.4 to 3.4.
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/component_versions.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- component_versions.mk 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ component_versions.mk 28 Jan 2006 02:29:52 -0000 1.2
@@ -60,7 +60,7 @@
# ICU
ifndef ICU_VERSDIR
- ICU_VERSDIR=libicu_2_4
+ ICU_VERSDIR=libicu_3_4
endif
ifndef ICU_RELDATE
ICU_RELDATE=20040820
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/components.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- components.mk 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ components.mk 28 Jan 2006 02:29:52 -0000 1.2
@@ -228,7 +228,7 @@
### ICU package ##########################################
-ICU_LIB_VERSION = 24
+ICU_LIB_VERSION = 34
ifdef ICU_SOURCE_ROOT
ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsconfig.mk 19 Jan 2006 22:05:52 -0000 1.6
+++ nsconfig.mk 28 Jan 2006 02:29:52 -0000 1.7
@@ -180,22 +180,26 @@
endif
ifeq ($(MODERNHP), 1)
-CC=cc -Ae +ESlit
CXX=/opt/aCC/bin/aCC
+CC=cc -Ae
ifeq ($(NSOS_RELEASE), B.11.23)
+ CC+=+Olit=all
ifeq ($(USE_64), 1)
BIT_SWITCH=+DD64
else
BIT_SWITCH=+DD32
endif
+ IPF_CFLAGS=-DPIC
else # 11.11 or earlier
+ CC+=+ESlit
ifeq ($(USE_64), 1)
BIT_SWITCH=+DA2.0W +DS2.0
else
BIT_SWITCH=+DAportable +DS1.1
endif
+ IPF_CFLAGS=
endif # B.11.23
-ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z
-DHPUX11
+ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z
-DHPUX11 $(IPF_CFLAGS)
EXTRA_LIBS= -ldld -lm -lpthread
else
CC=cc
Index: pkgadminutil.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pkgadminutil.mk 6 Dec 2005 18:38:20 -0000 1.5
+++ pkgadminutil.mk 28 Jan 2006 02:29:52 -0000 1.6
@@ -88,7 +88,7 @@
cp -p $(ABS_ROOT)/include/libadmsslutil/*.h
$(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
# Don't package sslpset.h
rm -f $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil/sslpset.h
- cd $(ADMSERV_OBJDIR)/lib; tar cf - *.* | (cd $(PKGDIR)/lib; tar xf -)
+ @cd $(ADMSERV_OBJDIR)/lib; tar cf - *.* | (cd $(PKGDIR)/lib; tar xvf -)
cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/$(PROP_ADMINUTIL)
pkgSBC: