Revision: 26188
http://sourceforge.net/p/gar/code/26188
Author: rmottola
Date: 2017-05-05 06:35:13 +0000 (Fri, 05 May 2017)
Log Message:
-----------
openssl1/branches/lts102: pk11 conditional like it was in 0.9.8
Modified Paths:
--------------
csw/mgar/pkg/openssl1/branches/lts102/Makefile
Modified: csw/mgar/pkg/openssl1/branches/lts102/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/Makefile 2017-05-04 18:08:48 UTC
(rev 26187)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile 2017-05-05 06:35:13 UTC
(rev 26188)
@@ -133,9 +133,17 @@
# Bug opened upstream: http://rt.openssl.org/Ticket/Display.html?id=3153
PATCHFILES += make_issetugid_support_configurable.patch
-PATCHFILES += openssl-1.0.2h-pkcs11-engine.patch
-ENGINES += pk11
+ifdef PKCS11
+ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc
solaris10-i386
+ifneq ($(shell /usr/bin/uname -r),5.9)
+ PATCHFILES += openssl-1.0.2h-pkcs11-engine.patch
+ ENGINES += pk11
+ CONFIGURE_ARGS += --pk11-libname=$(abspath
/usr/lib/$(MM_LIBDIR)/libpkcs11.so)
+endif
+endif
+
+
# Patches taken form oracle
PATCHFILES += 029-fork_safe.patch
PATCHFILES += 032-aes_cbc_len_check.patch
@@ -219,7 +227,6 @@
CONFIGURE_ARGS += $(CONFIGURE_FLAGS)
CONFIGURE_ARGS += $($(ISA)_$(GARCOMPILER_TYPE)_CONFIGURE_TARGET)
CONFIGURE_ARGS += shared
-CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so)
# For now we want the sun perl to be used
EXTRA_CONFIGURE_ENV += PERL="/usr/bin/perl"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
