mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixes for bug 322576 - patches for building on HP-UX IPF

This commit is contained in:
richm%stanfordalumni.org 2006-01-09 20:08:59 +00:00
Родитель dcb9344973
Коммит 66969e5074
8 изменённых файлов: 128 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
directory/c-sdk/build.mk
Просмотреть файл

@ -130,9 +130,11 @@ COPYFREEBL = 1
endif
endif
ifeq ($(OS_ARCH), HP-UX)
ifneq ($(OS_TEST),ia64)
COPYFREEBL = 1
endif
endif
endif
# svrcore library
SVRCOREVERS =
@ -362,6 +364,11 @@ ifeq ($(OS_ARCH), HP-UX)
# Use the C++ compiler to link
USE_CCC_TO_LINK=1
# include $ORIGIN in run time library path (works on HP-UX 11.23 and later)
ifeq ($(OS_TEST),ia64)
RPATHFLAG := \$$ORIGIN/../lib:\$$ORIGIN/../../lib:$(RPATHFLAG)
endif
# flag to pass to cc when linking to set runtime shared library search path
# this is used like this, for example: $(RPATHFLAG_PREFIX)../..
RPATHFLAG_PREFIX=-Wl,+s,+b,
@ -482,8 +489,12 @@ ifeq ($(OS_ARCH), HP-UX)
LINK_EXE = $(CC_FOR_LINK) -Wl,-E $(ALDFLAGS) $(LDFLAGS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS)
ifeq ($(USE_64), 1)
ifeq ($(OS_RELEASE), B.11.23)
LINK_EXE = $(CC_FOR_LINK) -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L +DD64 +DSblended -Wl,-E $(ALDFLAGS) $(LDFLAGS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS)
else
LINK_EXE = $(CC_FOR_LINK) -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L +DA2.0W +DS2.0 -Wl,-E $(ALDFLAGS) $(LDFLAGS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS)
endif
endif
else # HP-UX
# everything except HPUX

35
directory/c-sdk/config/HP-UX.mk
Просмотреть файл

@ -40,8 +40,11 @@
#
include $(MOD_DEPTH)/config/UNIX.mk
ifeq ($(OS_TEST),ia64)
DLL_SUFFIX = so
else
DLL_SUFFIX = sl
endif
ifeq ($(NS_USE_GCC), 1)
CC = gcc
@ -51,8 +54,12 @@ ifeq ($(NS_USE_GCC), 1)
else
CC = cc -Ae
CCC = CC -ext
ifeq ($(OS_RELEASE),B.11.23)
OS_CFLAGS = +Olit=all
else
OS_CFLAGS = +ESlit
endif
endif
RANLIB = echo
@ -77,7 +84,7 @@ endif
ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
OS_CFLAGS += -DHAVE_INT_LOCALTIME_R
endif
ifeq (,$(filter-out B.10.30 B.11.00,$(OS_RELEASE)))
ifeq (,$(filter-out B.10.30 B.11.00 B.11.23,$(OS_RELEASE)))
OS_CFLAGS += -DHAVE_POINTER_LOCALTIME_R
endif
@ -166,6 +173,30 @@ DEFAULT_IMPL_STRATEGY = _PTH
endif
endif
# 11.23 is similar to 11.00.
ifeq ($(OS_RELEASE),B.11.23)
ifneq ($(NS_USE_GCC), 1)
CCC = /opt/aCC/bin/aCC -AP -ext
ifeq ($(USE_64),1)
OS_CFLAGS += +DD64 +DSblended
#COMPILER_TAG = _64
else
OS_CFLAGS += +DD32 +DSblended
ifeq ($(HAVE_CCONF), 1)
COMPILER_TAG =
else
COMPILER_TAG = _32
endif
endif
endif
OS_CFLAGS += -DHPUX10 -DHPUX11 -D_LARGEFILE64_SOURCE -D_PR_HAVE_OFF64_T
ifeq ($(HAVE_CCONF), 1)
DEFAULT_IMPL_STRATEGY =
else
DEFAULT_IMPL_STRATEGY = _PTH
endif
endif
ifeq ($(DEFAULT_IMPL_STRATEGY),_EMU)
CLASSIC_NSPR = 1
endif

8
directory/c-sdk/config/Makefile.client
Просмотреть файл

@ -83,9 +83,17 @@ ifeq ($(OS_ARCH), IRIX)
endif
ifeq ($(OS_ARCH), HP-UX)
ifeq ($(OS_RELEASE), B.11.23)
ifeq ($(USE_64),1)
XLDOPTS += +DD64 +DSblended
else
XLDOPTS += +DD32 +DSblended
endif
else
ifeq ($(USE_64),1)
XLDOPTS += +DA2.0W
endif
endif
endif
ifeq ($(MOZ_OS2_TOOLS),EMX)

7
directory/c-sdk/config/Makefile.in
Просмотреть файл

@ -91,6 +91,13 @@ ifeq ($(OS_ARCH), IRIX)
endif
ifeq ($(OS_ARCH), HP-UX)
ifeq ($(OS_RELEASE), B.11.23)
ifeq ($(USE_64),1)
XLDOPTS += +DD64 +DSblended
else
XLDOPTS += +DD32 +DSblended
endif
else
ifeq ($(USE_64),1)
XLDOPTS += +DA2.0W
endif

22
directory/c-sdk/config/UNIX.mk
Просмотреть файл

@ -35,6 +35,16 @@
#
# ***** END LICENSE BLOCK *****
ifeq ($(OS_ARCH), HP-UX)
ifeq ($(OS_TEST), ia64)
ifdef USE_64
64BIT_TAG=_ia64_64
else
64BIT_TAG=_ia64_32
endif
endif
endif
PR_UNIXOS = 1
XP_DEFINE = -DXP_UNIX
OBJ_SUFFIX = o
@ -45,11 +55,19 @@ AR = ar cr $@
ifdef BUILD_OPT
OPTIMIZER = -O
DEFINES = -UDEBUG -DNDEBUG
OBJDIR_TAG = _OPT
ifeq ($(OS_ARCH), HP-UX)
OBJDIR_TAG = $(64BIT_TAG)_OPT
else
OBJDIR_TAG = _OPT
endif
else
OPTIMIZER = -g
DEFINES = -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
OBJDIR_TAG = _DBG
ifeq ($(OS_ARCH), HP-UX)
OBJDIR_TAG = $(64BIT_TAG)_DBG
else
OBJDIR_TAG = _DBG
endif
endif
# Name of the binary code directories

20
directory/c-sdk/ldap/clients/tools/Makefile.client
Просмотреть файл

@ -108,24 +108,16 @@ LDAPMODIFY_OBJ = $(addprefix $(OBJDEST)/, ldapmodify.o)
LDAPSEARCH_OBJ = $(addprefix $(OBJDEST)/, ldapsearch.o)
LDAPCOMPARE_OBJ = $(addprefix $(OBJDEST)/, ldapcompare.o)
LDAPCMP_OBJ = $(addprefix $(OBJDEST)/, ldapcmp.o)
ifeq ($(OS_ARCH), used-to-use-this-on-HP-UX)
LDAPTOOLCOMMON_OBJ = $(addprefix $(OBJDEST)/, common.o) \
$(addprefix $(OBJDEST)/, fileurl.o)
else
LDAPTOOLCOMMON_OBJ = $(addprefix $(OBJDEST)/, common.o) \
$(addprefix $(OBJDEST)/, convutf8.o) \
$(addprefix $(OBJDEST)/, fileurl.o)
endif
ifeq ($(LDAP_TOOL_ARGPIN),1)
LDAPTOOLCOMMON_OBJ += $(addprefix $(OBJDEST)/, argpin.o) \
$(addprefix $(OBJDEST)/, ntuserpin.o)
endif
endif
ifeq ($(OS_ARCH), used-to-use-this-on-HP-UX)
LDAPTOOLCPPCOMMON_OBJ = $(addprefix $(OBJDEST)/, convutf8.o)
endif
CLIENT_OBJS = $(LDAPDELETE_OBJ) $(LDAPMODIFY_OBJ) \
$(LDAPSEARCH_OBJ) $(LDAPCOMPARE_OBJ) $(LDAPCMP_OBJ) $(LDAPTOOLCOMMON_OBJ)
@ -343,18 +335,8 @@ endif
$(LDAPTOOLCOMMON_OBJ):
ifeq ($(OS_ARCH), used-to-use-this-on-HP-UX)
$(LDAPTOOLCPPCOMMON_OBJ): convutf8.cpp
ifneq ($(USE_64), 1)
/opt/aCC/bin/aCC -ext -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -c -DHPUX11 -DHPUX11_00 +DAportable +DS1.1 -D_LARGEFILE64_SOURCE -D_PR_HAVE_OFF64_T -DNO_NODELOCK -DNO_LIBLCACHE -DXP_UNIX -DHPUX -DMCC_HTTPD -DNS_DOMESTIC -DNET_SSL -DCLIENT_AUTH -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT -DNS_DS -DSPAPI20 -DBUILD_NUM=\"01.081.1519\" -DCPU_hppa -DOS_hpux -D_NO_THREADS_ -Dhpux -Dhpux -D_HPUX_SOURCE -D_REENTRANT -Aa -DLDAP_REFERRALS -DLDAP_LDBM -DLDAP_LDIF -DLDBM_USE_DBBTREE -DSLAPD_PASSWD_SHA1 -D__DBINTERFACE_PRIVATE -DNO_LIBLCACHE -DNS_DIRECTORY -DNET_SSL -DUSE_NSPR_MT -O $(INCLUDES) convutf8.cpp -o $(OBJDIR_NAME)/convutf8.o
else
/opt/aCC/bin/aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L +DA2.0W +DS2.0 -c -DHPUX11 -DHPUX11_00 -DIS_64 +e +DA2.0W +DS2.0 -D_LARGEFILE64_SOURCE -D_PR_HAVE_OFF64_T -DNO_NODELOCK -DNO_LIBLCACHE -DXP_UNIX -DHPUX -DMCC_DEBUG -g -DMCC_HTTPD -DNS_DOMESTIC -DNET_SSL -DCLIENT_AUTH -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT -DNS_DS -DSPAPI20 -DBUILD_NUM=\"01.081.1617\" -DCPU_hppa -DOS_hpux -D_NO_THREADS_ -Dhpux -Dhpux -D_HPUX_SOURCE -D_REENTRANT -Aa -DLDAP_DEBUG -DLDAP_REFERRALS -DLDAP_LDBM -DLDAP_LDIF -DLDBM_USE_DBBTREE -DSLAPD_PASSWD_SHA1 -D__DBINTERFACE_PRIVATE -DNO_LIBLCACHE -DNS_DIRECTORY -DNET_SSL -DUSE_NSPR_MT $(INCLUDES) -g convutf8.cpp -o $(OBJDIR_NAME)/convutf8.o
endif
else
$(LDAPTOOLCPPCOMMON_OBJ):
endif
$(LDAPCOMPARE): $(LDAPCOMPARE_OBJ) $(LDAPTOOLCOMMON_OBJ) \
$(LDAPTOOLCPPCOMMON_OBJ) $(LDTOOLS_LIBS_DEP)
$(LINK_EXE) $(LDAPCOMPARE_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDAPTOOLCPPCOMMON_OBJ) $(LDTOOLS_LIBS)

24
directory/c-sdk/ldap/libraries/libprldap/Makefile.client
Просмотреть файл

@ -71,6 +71,10 @@ DLLPRLDAP = $(addprefix $(PROBJDEST)/, \
nsldappr32v$(PRLDAPVERS).$(LIB_SUFFIX))
else
LIBPRLDAP = $(addprefix $(PROBJDEST)/, lib$(PRLDAP_LIBNAME).$(DLL_SUFFIX))
ifeq ($(OS_ARCH), HP-UX)
DLLPRLDAP = $(addprefix $(PROBJDEST)/, \
lib$(PRLDAP_LIBNAME).$(LIB_SUFFIX))
endif
endif
INSTALLDIR = $(DEPTH)/dist/$(OBJDIR_NAME)
@ -153,7 +157,11 @@ versiont.c: Makefile.client Version.c
-e "s|%VERSION%|$${v}|" \
< Version.c > $@)
ifeq ($(OS_ARCH), HP-UX)
all:: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBPRLDAP) $(DLLPRLDAP)
else
all:: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBPRLDAP)
endif
$(LIBDIR):
$(MKDIR) $(LIBDIR)
@ -165,6 +173,15 @@ ifdef SO_FILES_TO_REMOVE
endif
$(LINK_DLL) $(DSO_LDOPTS) $(PRLDAP_EXPORT_FLAGS) $(EXTRA_LIBS)
ifeq ($(OS_ARCH), HP-UX)
$(DLLPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
@echo ======= making $(DLLPRLDAP)
ifdef SO_FILES_TO_REMOVE
-$(RM) $(SO_FILES_TO_REMOVE)
endif
$(LINK_LIB) $(EXTRA_LIBS)
endif
veryclean:: clean
clean::
@ -174,11 +191,18 @@ clean::
$(OBJDEST):
$(MKDIR) $(OBJDEST)
ifeq ($(OS_ARCH), HP-UX)
install:: $(LIBPRLDAP) $(DLLPRLDAP)
else
install:: $(LIBPRLDAP)
endif
ifeq ($(OS_ARCH), WINNT)
$(INSTALL) -m 555 $(LIBPRLDAP) $(INSTALLDIR)/lib
$(INSTALL) -m 555 $(DLLPRLDAP) $(INSTALLDIR)/lib
endif
ifdef MKSHLIB
$(INSTALL) -m 555 $(LIBPRLDAP) $(INSTALLDIR)/lib
ifeq ($(OS_ARCH), HP-UX)
$(INSTALL) -m 555 $(DLLPRLDAP) $(INSTALLDIR)/lib
endif
endif

24
directory/c-sdk/ldap/libraries/libssldap/Makefile.client
Просмотреть файл

@ -68,6 +68,10 @@ DLLSSLDAP = $(addprefix $(SSLOBJDEST)/, $(SSLDAP_LIBNAME).$(LIB_SUFFIX))
else
LIBSSLDAP = $(addprefix $(SSLOBJDEST)/, \
lib$(SSLDAP_LIBNAME).$(DLL_SUFFIX))
ifeq ($(OS_ARCH), HP-UX)
DLLSSLDAP = $(addprefix $(SSLOBJDEST)/, \
lib$(SSLDAP_LIBNAME).$(LIB_SUFFIX))
endif
endif
INSTALLDIR = $(DEPTH)/dist/$(OBJDIR_NAME)
@ -168,7 +172,11 @@ versiont.c: Makefile.client Version.c
-e "s|%VERSION%|$${v}|" \
< Version.c > $@)
ifeq ($(OS_ARCH), HP-UX)
all:: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBSSLDAP) $(DLLSSLDAP)
else
all:: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBSSLDAP)
endif
$(LIBDIR):
$(MKDIR) $(LIBDIR)
@ -180,6 +188,15 @@ ifdef SO_FILES_TO_REMOVE
endif
$(LINK_DLL) $(DSO_LDOPTS) $(SSLDAP_EXPORT_FLAGS) $(EXTRA_LIBS)
ifeq ($(OS_ARCH), HP-UX)
$(DLLSSLDAP): $(OBJS) $(LIBDIR) $(SSLDAP_EXPORT_DEFS)
@echo ======= making $(DLLSSLDAP)
ifdef SO_FILES_TO_REMOVE
-$(RM) $(SO_FILES_TO_REMOVE)
endif
$(LINK_LIB) $(EXTRA_LIBS)
endif
veryclean:: clean
clean::
@ -189,11 +206,18 @@ clean::
$(OBJDEST):
$(MKDIR) $(OBJDEST)
ifeq ($(OS_ARCH), HP-UX)
install:: $(LIBSSLDAP) $(DLLSSLDAP)
else
install:: $(LIBSSLDAP)
endif
ifeq ($(OS_ARCH), WINNT)
$(INSTALL) -m 555 $(LIBSSLDAP) $(INSTALLDIR)/lib
$(INSTALL) -m 555 $(DLLSSLDAP) $(INSTALLDIR)/lib
endif
ifdef MKSHLIB
$(INSTALL) -m 555 $(LIBSSLDAP) $(INSTALLDIR)/lib
ifeq ($(OS_ARCH), HP-UX)
$(INSTALL) -m 555 $(DLLSSLDAP) $(INSTALLDIR)/lib
endif
endif