7039910 move OpenSSL from SFW to Userland gate (fix fips path and make targets)
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 05 Jul 2011 13:46:16 -0700
changeset 365 f10c11e3a4a5
parent 364 73fbb345104d
child 366 5abfaefe3013
7039910 move OpenSSL from SFW to Userland gate (fix fips path and make targets)
components/openssl/openssl-0.9.8-fips-140/Makefile
components/openssl/openssl-fips/Makefile
--- a/components/openssl/openssl-0.9.8-fips-140/Makefile	Tue Jul 05 09:53:54 2011 -0700
+++ b/components/openssl/openssl-0.9.8-fips-140/Makefile	Tue Jul 05 13:46:16 2011 -0700
@@ -130,6 +130,10 @@
 	( unset BITS; \
 	$(MAKE) -C $(COMPONENT_DIR)/../openssl-fips install; )
 
+# download, clean, and clobber should all propogate to the fips bits
+download clobber clean::
+	(cd ../openssl-fips ; $(GMAKE) [email protected])
+
 # We do not ship our engines as patches since it would be more difficult to
 # update the files which have been under continuous development. We rather copy
 # the files to the right directories and let OpenSSL makefiles build it.
--- a/components/openssl/openssl-fips/Makefile	Tue Jul 05 09:53:54 2011 -0700
+++ b/components/openssl/openssl-fips/Makefile	Tue Jul 05 13:46:16 2011 -0700
@@ -38,6 +38,8 @@
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin
+
 # In order to build a 32bit version on a 64bit system the isalist(1) command
 # must be substituted for the 32bit build so that amd64|sparcv9 is not part of
 # its output. isalist is used internally when configuring the canister before