summaryrefslogtreecommitdiff
path: root/usr/src/lib/openssl/Makefile.openssl
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/openssl/Makefile.openssl')
-rw-r--r--usr/src/lib/openssl/Makefile.openssl17
1 files changed, 10 insertions, 7 deletions
diff --git a/usr/src/lib/openssl/Makefile.openssl b/usr/src/lib/openssl/Makefile.openssl
index 50f70c6435..7f640bb1f9 100644
--- a/usr/src/lib/openssl/Makefile.openssl
+++ b/usr/src/lib/openssl/Makefile.openssl
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,8 @@
#
# ident "%Z%%M% %I% %E% SMI"
#
-# OpenSSL source is common between lib and stand (for wanboot)
-# For userland consumers it is in /usr/sfw so we define some macros incase
+# OpenSSL source is common between lib and stand (for wanboot).
+# For userland consumers it is in /usr/sfw so we define some macros in case
# it moves else where later (it has moved twice already!).
#
# OPENSSL_CPPFLAGS and OPENSSL_LDLIBS OPENSSL_DYNFLAGS should be used
@@ -51,13 +50,16 @@ OPENSSL_NO_XXX = \
-DOPENSSL_NO_RC5 \
-DOPENSSL_NO_IDEA \
-DOPENSSL_NO_EC \
+ -DOPENSSL_NO_ECDH \
+ -DOPENSSL_NO_ECDSA \
-DOPENSSL_NO_HW_CSWIFT \
- -DOPENSSL_NO_HW_NCIPHER \
-DOPENSSL_NO_HW_ATALLA \
-DOPENSSL_NO_HW_NURON \
-DOPENSSL_NO_HW_UBSEC \
-DOPENSSL_NO_HW_AEP \
-DOPENSSL_NO_HW_SUREWARE \
+ -DOPENSSL_NO_HW_CHIL \
+ -DOPENSSL_NO_HW_GMP \
-DOPENSSL_NO_HW_4758_CCA
OPENSSL_BUILD_CPPFLAGS_sparc = -DB_ENDIAN
@@ -69,6 +71,7 @@ OPENSSL_BUILD_CPPFLAGS = \
-DSOLARIS_OPENSSL \
-DDEVRANDOM=\"/dev/urandom\" \
-DOPENSSLDIR=\"$(OPENSSL_ETCDIR)\" \
+ -DENGINESDIR=\"$(OPENSSL_ETCDIR)/lib/engines\" \
-DDSO_DLFCN -DHAVE_DLFCN_H \
-D_REENTRANT \
-DOPENSSL_THREADS \
@@ -83,4 +86,4 @@ OPENSSL_LDFLAGS += -L$(PARENT_ROOT)$(SFWLIBDIR)
OPENSSL_LDFLAGS += -L$(SFWLIBDIR)
OPENSSL_DYNFLAGS = -R $(SFWLIBDIR)
-CFLAGS += -_gcc=-fasm
+$(__GNUC)CFLAGS += -_gcc=-fasm