Mercurial > oi > oi-build
changeset 364:73fbb345104d
7039910 move OpenSSL from SFW to Userland gate (fix path/make args)
author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
---|---|
date | Tue, 05 Jul 2011 09:53:54 -0700 |
parents | 9c0cad004039 |
children | f10c11e3a4a5 |
files | components/openssl/openssl-0.9.8-fips-140/Makefile components/openssl/openssl-1.0.0/Makefile components/openssl/openssl-fips/Makefile |
diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/components/openssl/openssl-0.9.8-fips-140/Makefile Sun Jul 03 23:28:09 2011 -0700 +++ b/components/openssl/openssl-0.9.8-fips-140/Makefile Tue Jul 05 09:53:54 2011 -0700 @@ -20,7 +20,9 @@ # # 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
--- a/components/openssl/openssl-1.0.0/Makefile Sun Jul 03 23:28:09 2011 -0700 +++ b/components/openssl/openssl-1.0.0/Makefile Tue Jul 05 09:53:54 2011 -0700 @@ -20,7 +20,7 @@ # # 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 @@ -39,6 +39,8 @@ 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 @@ -140,7 +142,7 @@ # 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
--- a/components/openssl/openssl-fips/Makefile Sun Jul 03 23:28:09 2011 -0700 +++ b/components/openssl/openssl-fips/Makefile Tue Jul 05 09:53:54 2011 -0700 @@ -26,7 +26,7 @@ # 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