[csw-devel] SF.net SVN: gar:[20408] csw/mgar/pkg/openssl1/trunk/Makefile

[chninkel at users.sourceforge.net]

Revision: 20408
          http://gar.svn.sourceforge.net/gar/?rev=20408&view=rev
Author:   chninkel
Date:     2013-03-10 22:42:37 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
openssl1/trunk: removed conditional on PKCS11 and T4 support

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-10 22:35:23 UTC (rev 20407)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-10 22:42:37 UTC (rev 20408)
@@ -10,9 +10,6 @@
 # software causes damage.
 #####################################################################
 
-PKCS11 = 1
-T4 = 1
-
 ###### Package information #######
 
 NAME = openssl
@@ -30,6 +27,8 @@
 
 PACKAGES = CSWlibssl1-0-0 CSWlibssl-dev CSWopenssl-utils
 
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-soarc solaris11-i386
+
 SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries
 PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT)
 PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs 
@@ -122,25 +121,19 @@
 PATCHFILES += 0007-enables-symbols-versioning.patch
 
 # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
-ifdef PKCS11
 ifneq ($(shell /usr/bin/uname -r),5.9)
        PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30
 endif
-endif
 
 # support for sparc t4 crypto engine 
 # see http://bubbva.blogspot.fr/2011/11/exciting-crypto-advances-with-t4.html
 #     https://blogs.oracle.com/DanX/entry/sparc_t4_openssl_engine
 # patch taken from https://hg.openindiana.org/upstream/oracle/userland-gate/
-ifdef T4
 ifeq ($(shell /usr/bin/uname -p),sparc) 
-ifneq ($(shell /usr/bin/uname -r),5.9)
-ifneq ($(shell /usr/bin/uname -r),5.10)
+ifeq ($(shell /usr/bin/uname -r),5.11)
 	PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch
 endif
 endif
-endif
-endif
 
 LICENSE = LICENSE
 
@@ -174,18 +167,10 @@
 CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR)
 
 # PKCS11 is only for Solaris 10 so we must create solaris 10 specific packages
-ifdef PKCS11
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 ifneq ($(shell /usr/bin/uname -r),5.9)
         CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) 
-endif
 endif 
 
-ifdef T4
-PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
-endif
-
-
 # For now we want the sun perl to be used
 CONFIGURE_ENV += PERL="/usr/bin/perl"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.