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

@@ -68,5 +68,3 @@ DSO_LDFLAGS		=
 
 # +Z generates position independent code for use in shared libraries.
 DSO_CFLAGS = +Z
-
-HAVE_PURIFY		= 1

security/coreconf/IRIX.mk

@@ -103,8 +103,6 @@ endif
 
 MKSHLIB     += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
 
-HAVE_PURIFY	= 1
-
 DSO_LDOPTS	= -elf -shared -all
 
 ifdef DSO_BACKEND

security/coreconf/README

@@ -316,8 +316,7 @@ OVERVIEW of "rules.mk":
         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)
@@ -424,10 +423,6 @@ OVERVIEW of "rules.mk":
                                           specified by the
                                           $(SHARED_LIBRARY) variable
 
-        $(PURE_LIBRARY):                  build the "purified" library
-                                          specified by the
-                                          $(PURE_LIBRARY) variable
-
 
         PROGRAMS
         --------

security/coreconf/ReliantUNIX.mk

@@ -77,7 +77,6 @@ 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)

security/coreconf/SunOS4.1.3_U1.mk

@@ -51,7 +51,6 @@ 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      =
 

security/coreconf/SunOS5.mk

@@ -125,6 +125,5 @@ else
 	DSO_CFLAGS += -KPIC
 endif
 
-HAVE_PURIFY  = 1
 NOSUCHFILE   = /solaris-rm-f-sucks
 

security/coreconf/command.mk

@@ -39,7 +39,6 @@
 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

security/coreconf/prefix.mk

@@ -69,15 +69,6 @@ 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
 #

security/coreconf/rules.mk

@@ -103,9 +103,6 @@ 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
@@ -243,9 +240,6 @@ 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
@@ -268,9 +262,6 @@ 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
@@ -361,13 +352,6 @@ 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)
@@ -385,16 +369,6 @@ else
 	$(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))

security/coreconf/ruleset.mk

@@ -132,8 +132,7 @@ endif
 # - (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).
@@ -160,14 +159,6 @@ ifdef LIBRARY_NAME
 		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
 
@@ -187,11 +178,7 @@ 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
 

security/coreconf/suffix.mk

@@ -97,19 +97,6 @@ ifndef IMPORT_LIB_SUFFIX
 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