Commits

Anonymous committed 55291af Draft

7039910 move OpenSSL from SFW to Userland gate (fix path/make args)

Comments (0)

Files changed (3)

components/openssl/openssl-0.9.8-fips-140/Makefile

 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-include $(WS_TOP)/make-rules/shared-macros.mk
+include ../../../make-rules/shared-macros.mk
+
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin
 
 COMPONENT_NAME =	openssl
 # Note that this is the OpenSSL version that is used to build FIPS-140 certified

components/openssl/openssl-1.0.0/Makefile

 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-include $(WS_TOP)/make-rules/shared-macros.mk
+include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =	openssl
 # When new version of OpenSSL comes in, you must update both COMPONENT_VERSION
 include $(WS_TOP)/make-rules/ips.mk
 include $(WS_TOP)/make-rules/lint-libraries.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin
+
 # OpenSSL does not use autoconf but its own configure system.
 CONFIGURE_SCRIPT = $(SOURCE_DIR)/Configure
 
 # also add /usr/perl5/bin to PATH so that OpenSSL install code can locate the
 # system pod2man. If not set, OpenSSL make would use an internal implementation
 # from the tarball which would corrupt some man pages.
-COMPONENT_INSTALL_ENV += PATH=$(PATH):/usr/perl5/bin MANDIR=/usr/share/man
+COMPONENT_INSTALL_ARGS += PATH=$(PATH) MANDIR=/usr/share/man
 
 # We could run OpenSSL install code for 32 bits only to process header files and
 # manual pages. However, link libraries depend on install stamps so we run

components/openssl/openssl-fips/Makefile

 # to build FIPS-140 certified OpenSSL libraries.
 #
 
-include $(WS_TOP)/make-rules/shared-macros.mk
+include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =	openssl-fips
 COMPONENT_VERSION =	1.2