Bugzilla bug #63768: do not build "purified" libraries, which are no longer
authorwtc%netscape.com
Wed, 27 Dec 2000 00:42:46 +0000
changeset 982 9680ecf1235ff975b8a786fd881354cc7ecc0174
parent 981 54d5e196d6e372270361272ad905c755495ea82c
child 983 fa0c6a18583c625418e2ad8188a5933fd209e74d
push idunknown
push userunknown
push dateunknown
bugs63768
Bugzilla bug #63768: do not build "purified" libraries, which are no longer necessary for the current version of Purify. Modified Files: HP-UX.mk IRIX.mk README ReliantUNIX.mk SunOS4.1.3_U1.mk SunOS5.mk command.mk prefix.mk rules.mk ruleset.mk suffix.mk
security/coreconf/HP-UX.mk
security/coreconf/IRIX.mk
security/coreconf/README
security/coreconf/ReliantUNIX.mk
security/coreconf/SunOS4.1.3_U1.mk
security/coreconf/SunOS5.mk
security/coreconf/command.mk
security/coreconf/prefix.mk
security/coreconf/rules.mk
security/coreconf/ruleset.mk
security/coreconf/suffix.mk
--- a/security/coreconf/HP-UX.mk
+++ b/security/coreconf/HP-UX.mk
@@ -63,10 +63,8 @@ LDFLAGS			= -z -Wl,+s
 
 MKSHLIB			= $(LD) $(DSO_LDOPTS)
 
 DSO_LDOPTS		= -b
 DSO_LDFLAGS		=
 
 # +Z generates position independent code for use in shared libraries.
 DSO_CFLAGS = +Z
-
-HAVE_PURIFY		= 1
--- a/security/coreconf/IRIX.mk
+++ b/security/coreconf/IRIX.mk
@@ -98,18 +98,16 @@ else
 endif
 
 ifeq ($(USE_N32),1)
 	SHLIB_LD_OPTS	+= -n32 -mips3
 endif
 
 MKSHLIB     += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
 
-HAVE_PURIFY	= 1
-
 DSO_LDOPTS	= -elf -shared -all
 
 ifdef DSO_BACKEND
 	DSO_LDOPTS += -soname $(DSO_NAME)
 endif
 
 #
 # Revision notes:
--- a/security/coreconf/README
+++ b/security/coreconf/README
@@ -311,18 +311,17 @@ OVERVIEW of "rules.mk":
                                 such as Java providing a simple
                                 mechanism which allows no need for
                                 developers to memorize specialized
                                 rules
 
         libs::                  recursively build
                                 static (archival) $(LIBRARY), shared
                                 (dynamic link) $(SHARED_LIBRARY),
-                                import $(IMPORT_LIBRARY), and/or
-                                "purified" $(PURE_LIBRARY)
+                                and/or import $(IMPORT_LIBRARY)
                                 libraries
 
         program::               recursively build $(PROGRAM)
                                 executable
 
         install::               recursively copy all libraries to
                                 $(SOURCE_LIB_DIR) directory;
                                 recursively copy all executables to
@@ -419,20 +418,16 @@ OVERVIEW of "rules.mk":
                                           specified by the
                                           $(IMPORT_LIBRARY) variable
 
         $(SHARED_LIBRARY):                build the shared
                                           (dynamic link) library
                                           specified by the
                                           $(SHARED_LIBRARY) variable
 
-        $(PURE_LIBRARY):                  build the "purified" library
-                                          specified by the
-                                          $(PURE_LIBRARY) variable
-
 
         PROGRAMS
         --------
         $(PROGRAM):                       build the binary executable
                                           specified by the $(PROGRAM)
                                           rule
 
         $(OBJDIR)/
--- a/security/coreconf/ReliantUNIX.mk
+++ b/security/coreconf/ReliantUNIX.mk
@@ -72,13 +72,12 @@ CPU_ARCH    = mips
 RANLIB      = /bin/true
 
 # For purify
 NOMD_OS_CFLAGS += $(ODD_CFLAGS)
 
 # we do not have -MDupdate ...
 OS_CFLAGS   += $(NOMD_OS_CFLAGS)
 OS_LIBS     += -lsocket -lnsl -lresolv -lgen -ldl -lc /usr/ucblib/libucb.a
-HAVE_PURIFY  = 0
 
 ifdef DSO_BACKEND
 	DSO_LDOPTS += -h $(DSO_NAME)
 endif
--- a/security/coreconf/SunOS4.1.3_U1.mk
+++ b/security/coreconf/SunOS4.1.3_U1.mk
@@ -46,14 +46,13 @@ CC         = gcc
 RANLIB     = ranlib
 CPU_ARCH   = sparc
 
 # Purify doesn't like -MDupdate
 NOMD_OS_CFLAGS += -Wall -Wno-format -DSUNOS4
 OS_CFLAGS      += $(DSO_CFLAGS) $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
 MKSHLIB         = $(LD)
 MKSHLIB        += $(DSO_LDOPTS)
-HAVE_PURIFY     = 1
 NOSUCHFILE      = /solaris-rm-f-sucks
 DSO_LDOPTS      =
 
 # -fPIC generates position-independent code for use in a shared library.
 DSO_CFLAGS += -fPIC
--- a/security/coreconf/SunOS5.mk
+++ b/security/coreconf/SunOS5.mk
@@ -120,11 +120,10 @@ DSO_LDOPTS += -G
 # -KPIC generates position independent code for use in shared libraries.
 # (Similarly for -fPIC in case of gcc.)
 ifdef NS_USE_GCC
 	DSO_CFLAGS += -fPIC
 else
 	DSO_CFLAGS += -KPIC
 endif
 
-HAVE_PURIFY  = 1
 NOSUCHFILE   = /solaris-rm-f-sucks
 
--- a/security/coreconf/command.mk
+++ b/security/coreconf/command.mk
@@ -34,17 +34,16 @@
 #######################################################################
 # Master "Core Components" default command macros;                    #
 # can be overridden in <arch>.mk                                      #
 #######################################################################
 
 AS            = $(CC)
 ASFLAGS      += $(CFLAGS)
 CCF           = $(CC) $(CFLAGS)
-PURIFY        = purify $(PURIFYOPTIONS)
 LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
 LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
 NFSPWD        = $(NSINSTALL_DIR)/nfspwd
 CFLAGS       += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 		$(XCFLAGS)
 RANLIB        = echo
 TAR           = /bin/tar
 #
--- a/security/coreconf/prefix.mk
+++ b/security/coreconf/prefix.mk
@@ -64,25 +64,16 @@ ifndef DLL_PREFIX
 	endif
 endif
 
 
 ifndef IMPORT_LIB_PREFIX
 	IMPORT_LIB_PREFIX = 
 endif
 
-
-ifndef PURE_LIB_PREFIX
-	ifeq ($(OS_ARCH), WINNT)
-		PURE_LIB_PREFIX =
-	else
-		PURE_LIB_PREFIX = purelib
-	endif
-endif
-
 #
 # Program prefixes
 #
 
 ifndef PROG_PREFIX
 	PROG_PREFIX = 
 endif
 
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -98,19 +98,16 @@ ifdef LIBRARY
 	$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR)
 endif
 ifdef SHARED_LIBRARY
 	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
 endif
 ifdef IMPORT_LIBRARY
 	$(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
 endif
-ifdef PURE_LIBRARY
-	$(INSTALL) -m 775 $(PURE_LIBRARY) $(SOURCE_LIB_DIR)
-endif
 ifdef PROGRAM
 	$(INSTALL) -m 775 $(PROGRAM) $(SOURCE_BIN_DIR)
 endif
 ifdef PROGRAMS
 	$(INSTALL) -m 775 $(PROGRAMS) $(SOURCE_BIN_DIR)
 endif
 	+$(LOOP_OVER_DIRS)
 
@@ -238,19 +235,16 @@ ifdef LIBRARY
 	-$(PLCYPATCH) $(PLCYPATCH_ARGS) $(LIBRARY)
 endif
 ifdef SHARED_LIBRARY
 	-$(PLCYPATCH) $(PLCYPATCH_ARGS) $(SHARED_LIBRARY)
 endif
 ifdef IMPORT_LIBRARY
 	-$(PLCYPATCH) $(PLCYPATCH_ARGS) $(IMPORT_LIBRARY)
 endif
-ifdef PURE_LIBRARY
-	-$(PLCYPATCH) $(PLCYPATCH_ARGS) $(PURE_LIBRARY)
-endif
 ifdef PROGRAM
 	-$(PLCYPATCH) $(PLCYPATCH_ARGS) $(PROGRAM)
 endif
 ifdef PROGRAMS
 	-$(PLCYPATCH) $(PLCYPATCH_ARGS) $(PROGRAMS)
 endif
 	+$(LOOP_OVER_DIRS)
 else
@@ -263,19 +257,16 @@ ifdef LIBRARY
 	$(INSTALL) -m 444 $(LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
 endif
 ifdef SHARED_LIBRARY
 	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
 endif
 ifdef IMPORT_LIBRARY
 	$(INSTALL) -m 555 $(IMPORT_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
 endif
-ifdef PURE_LIBRARY
-	$(INSTALL) -m 555 $(PURE_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)
-endif
 ifdef PROGRAM
 	$(INSTALL) -m 555 $(PROGRAM) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR)
 endif
 ifdef PROGRAMS
 	$(INSTALL) -m 555 $(PROGRAMS) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR)
 endif
 	+$(LOOP_OVER_DIRS)
 
@@ -356,23 +347,16 @@ else
 	$(MKSHLIB) -o $@ $(OBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
 	chmod +x $@
 endif
 endif
 ifneq ($(POLICY),)
 	-$(PLCYPATCH) $(PLCYPATCH_ARGS) $@
 endif
 
-$(PURE_LIBRARY):
-	rm -f $@
-ifneq ($(OS_ARCH), WINNT)
-	$(AR) $(OBJS)
-endif
-	$(RANLIB) $@
-
 ifeq ($(OS_ARCH), WINNT)
 $(RES): $(RESNAME)
 	@$(MAKE_OBJDIR)
 	$(RC) -Fo$(RES) $(RESNAME)
 	@echo $(RES) finished
 endif
 
 $(OBJDIR)/$(PROG_PREFIX)%$(PROG_SUFFIX): $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX)
@@ -380,26 +364,16 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 	$(MKPROG) $(OBJDIR)/$(PROG_PREFIX)$*$(OBJ_SUFFIX) -Fe$@ -link \
 	$(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 else
 	$(MKPROG) -o $@ $(OBJDIR)/$(PROG_PREFIX)$*$(OBJ_SUFFIX) \
 	$(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 endif
 
-ifdef HAVE_PURIFY
-$(OBJDIR)/$(PROG_PREFIX)%.pure: $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH),WINNT)
-	$(PURIFY) $(CC) -Fo$@ -c $(CFLAGS) $(OBJDIR)/$(PROG_PREFIX)$*$(OBJ_SUFFIX) $(PURELDFLAGS)
-else
-	$(PURIFY) $(CC) -o $@ $(CFLAGS) $(OBJDIR)/$(PROG_PREFIX)$*$(OBJ_SUFFIX) $(PURELDFLAGS)
-endif
-endif
-
 WCCFLAGS1 := $(subst /,\\,$(CFLAGS))
 WCCFLAGS2 := $(subst -I,-i=,$(WCCFLAGS1))
 WCCFLAGS3 := $(subst -D,-d,$(WCCFLAGS2))
 
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
--- a/security/coreconf/ruleset.mk
+++ b/security/coreconf/ruleset.mk
@@ -127,18 +127,17 @@ ifeq ($(MKPROG),)
 endif
 
 #
 # This makefile contains rules for building the following kinds of
 # objects:
 # - (1) LIBRARY: a static (archival) library
 # - (2) SHARED_LIBRARY: a shared (dynamic link) library
 # - (3) IMPORT_LIBRARY: an import library, used only on Windows
-# - (4) PURE_LIBRARY: a library for Purify
-# - (5) PROGRAM: an executable binary
+# - (4) PROGRAM: an executable binary
 #
 # NOTE:  The names of libraries can be generated by simply specifying
 # LIBRARY_NAME (and LIBRARY_VERSION in the case of non-static libraries).
 #
 
 ifdef LIBRARY_NAME
 	ifeq ($(OS_ARCH), WINNT)
 		#
@@ -155,24 +154,16 @@ ifdef LIBRARY_NAME
 		endif
 	else
 		LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX)
 		ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
 			SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
 		else
 			SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
 		endif
-
-		ifdef HAVE_PURIFY
-			ifdef DSO_BACKEND
-				PURE_LIBRARY = $(OBJDIR)/purelib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
-			else
-				PURE_LIBRARY = $(OBJDIR)/purelib$(LIBRARY_NAME).$(LIB_SUFFIX)
-			endif
-		endif
 	endif
 endif
 
 #
 # Common rules used by lots of makefiles...
 #
 
 ifdef PROGRAM
@@ -182,21 +173,17 @@ endif
 ifdef PROGRAMS
 	PROGRAMS := $(addprefix $(OBJDIR)/, $(PROGRAMS:%=%$(JDK_DEBUG_SUFFIX)$(PROG_SUFFIX)))
 endif
 
 ifndef TARGETS
 	ifeq ($(OS_ARCH), WINNT)
 		TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
 	else
-		TARGETS = $(LIBRARY) $(SHARED_LIBRARY)
-		ifdef HAVE_PURIFY
-			TARGETS += $(PURE_LIBRARY)
-		endif
-		TARGETS += $(PROGRAM)
+		TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM)
 	endif
 endif
 
 ifndef OBJS
 	SIMPLE_OBJS = $(JRI_STUB_CFILES) \
 		$(addsuffix $(OBJ_SUFFIX), $(JMC_GEN)) \
 		$(CSRCS:.c=$(OBJ_SUFFIX)) \
 		$(CPPSRCS:.cpp=$(OBJ_SUFFIX)) \
--- a/security/coreconf/suffix.mk
+++ b/security/coreconf/suffix.mk
@@ -92,29 +92,16 @@ ifndef IMPORT_LIB_SUFFIX
 	ifeq ($(OS_ARCH), WINNT)
 		IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX)
 	else
 		IMPORT_LIB_SUFFIX = 
 	endif
 endif
 
 
-ifndef PURE_LIB_SUFFIX
-	ifeq ($(OS_ARCH), WINNT)
-		PURE_LIB_SUFFIX =
-	else
-		ifdef DSO_BACKEND
-			PURE_LIB_SUFFIX = .$(DLL_SUFFIX)
-		else
-			PURE_LIB_SUFFIX = .$(LIB_SUFFIX)
-		endif
-	endif
-endif
-
-
 ifndef STATIC_LIB_SUFFIX_FOR_LINKING
 	STATIC_LIB_SUFFIX_FOR_LINKING = $(STATIC_LIB_SUFFIX)
 endif
 
 
 ifndef DYNAMIC_LIB_SUFFIX_FOR_LINKING
 	ifeq ($(OS_ARCH), WINNT)
 		DYNAMIC_LIB_SUFFIX_FOR_LINKING = $(IMPORT_LIB_SUFFIX)