6944296 Solaris needs a PKCS#11 provider to allow access to KMS keystore functionality (fix gcc link issue)
--- a/usr/src/lib/libkmsagent/Makefile.com Wed Jun 30 03:42:01 2010 -0700
+++ b/usr/src/lib/libkmsagent/Makefile.com Wed Jun 30 07:32:37 2010 -0700
@@ -85,8 +85,11 @@
LIBS = $(DYNLIB)
-LDLIBS += -lCstd -lCrun -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket
-LDLIBS64 += -lCstd -lCrun -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket
+CCNEEDED = -lCstd -lCrun
+$(__GNUC)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ -lgcc_s
+
+LDLIBS += $(CCNEEDED) -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket
+LDLIBS64 += $(CCNEEDED) -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket
DEFINES = -DKMSUSERPKCS12 -D_REENTRANT -DNOWCSICMP -DUNIX \
-DWITH_OPENSSL -DHAVE_OPENSSL_SSL_H \
--- a/usr/src/lib/libkmsagent/amd64/Makefile Wed Jun 30 03:42:01 2010 -0700
+++ b/usr/src/lib/libkmsagent/amd64/Makefile Wed Jun 30 07:32:37 2010 -0700
@@ -27,4 +27,9 @@
include ../Makefile.com
include $(SRC)/lib/Makefile.lib.64
+CCNEEDED = -lCrun -lCstd
+$(__GNUC)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ -lgcc_s
+
+LDLIBS64 += $(CCNEEDED) -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket
+
install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libkmsagent/sparcv9/Makefile Wed Jun 30 03:42:01 2010 -0700
+++ b/usr/src/lib/libkmsagent/sparcv9/Makefile Wed Jun 30 07:32:37 2010 -0700
@@ -18,11 +18,18 @@
#
# CDDL HEADER END
#
+
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
+
include ../Makefile.com
include $(SRC)/lib/Makefile.lib.64
+CCNEEDED = -lCrun -lCstd
+$(__GNUC)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ -lgcc_s
+
+LDLIBS64 += $(CCNEEDED) -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket
+
install: all $(ROOTLIBS64) $(ROOTLINKS64)