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

[chninkel at users.sourceforge.net]

Revision: 18001
          http://gar.svn.sourceforge.net/gar/?rev=18001&view=rev
Author:   chninkel
Date:     2012-05-11 22:05:10 +0000 (Fri, 11 May 2012)
Log Message:
-----------
openssl1/trunk: enabled build on solaris 11 for the t4 patch

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2012-05-11 21:32:50 UTC (rev 18000)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2012-05-11 22:05:10 UTC (rev 18001)
@@ -125,9 +125,11 @@
 # patch taken from https://hg.openindiana.org/upstream/oracle/userland-gate/
 ifdef T4
 ifneq ($(shell /usr/bin/uname -r),5.9)
+ifneq ($(shell /usr/bin/uname -r),5.10)
 	PATCHFILES += openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11
 endif
 endif
+endif
 
 LICENSE = LICENSE
 
@@ -166,7 +168,17 @@
 endif
 endif 
 
+ifdef T4
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386
+endif
 
+
+ifeq ($(shell /usr/bin/uname -r),5.11)
+GARCOMPILER = SOS12U3
+endif
+
+
+
 # For now we want the sun perl to be used
 CONFIGURE_ENV += PERL="/usr/bin/perl"
 

Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11	2012-05-11 21:32:50 UTC (rev 18000)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11	2012-05-11 22:05:10 UTC (rev 18001)
@@ -8400,9 +8400,9 @@
 +	SET_SIZE(t4_sha1_multiblock)
 +
 +#endif  /* lint || __lint */
-diff -uNr openssl-1.0.1c.orig/crypto/sha/t4_sha2.S openssl-1.0.1c/crypto/sha/t4_sha2.S
---- openssl-1.0.1c.orig/crypto/sha/t4_sha2.S	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1c/crypto/sha/t4_sha2.S	2012-05-11 21:34:39.095354000 +0200
+diff -uNr openssl-1.0.1c.orig/crypto/sha/asm/t4_sha2.S openssl-1.0.1c/crypto/sha/asm/t4_sha2.S
+--- openssl-1.0.1c.orig/crypto/sha/asm/t4_sha2.S	1970-01-01 01:00:00.000000000 +0100
++++ openssl-1.0.1c/crypto/sha/asm/t4_sha2.S	2012-05-11 21:34:39.095354000 +0200
 @@ -0,0 +1,314 @@
 +/*
 + * ====================================================================

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