SF.net SVN: gar:[22325] csw/mgar/pkg/openssl1/trunk

[chninkel at users.sourceforge.net]

Revision: 22325
          http://gar.svn.sourceforge.net/gar/?rev=22325&view=rev
Author:   chninkel
Date:     2013-10-27 20:40:51 +0000 (Sun, 27 Oct 2013)
Log Message:
-----------
openssl1/trunk: enable sse2 usage based on runtime selection

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2013-10-27 20:37:56 UTC (rev 22324)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2013-10-27 20:40:51 UTC (rev 22325)
@@ -146,10 +146,6 @@
 BUILD64 = 1
 ISAEXEC = 1
 
-# We re-enable the i386 default ISA to be able
-# to provide an isa not requiring sse2 for old servers
-ISA_DEFAULT_i386 = i386
-
 # The list of instructions set for which we will 
 # provide optimized libraries and binaries
 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
@@ -173,7 +169,7 @@
 
 # The corresponding os/compiler to pass to the
 # openssl Configure script
-i386_OS_COMPILER 	= no-sse2 solaris-x86-cc-sunw
+i386_OS_COMPILER 	= solaris-x86-cc-sunw
 pentium_pro_OS_COMPILER	= solaris-x86-pentium_pro-cc-sunw
 amd64_OS_COMPILER 	= solaris64-x86_64-cc-sunw
 
@@ -225,6 +221,17 @@
 
 include gar/category.mk
 
+# We remove SSE2 hardware capability in the elf header of libcrypto as
+# openssl is able to select it at runtime and the Solaris OS support SSE2 since
+# Solaris 9 4/04 (according to "Sun Studio 12: C++ User's Guide")
+post-install:
+	if [[ "$(uname -p)" = "i386" ]]; then \
+		echo " ==> Removing the SSE2 hardware capability from libcrypto"; \
+		chmod +w "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \
+		elfedit -e 'cap:hw1 -and -cmp sse2' "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \
+	fi
+	@$(MAKECOOKIE)
+
 pre-configure-modulated:
 	echo " ==> Creating configure script"
 	cd $(WORKSRC) && ln -nf Configure configure

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2013-10-27 20:37:56 UTC (rev 22324)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2013-10-27 20:40:51 UTC (rev 22325)
@@ -2,6 +2,7 @@
 
   * Enabled use of solaris native issetugid function in crypto/uid.c
     thanks to Joerg Schilling.
+  * Enable sse2 usage based on runtime selection.
 
    -- yann rouillard <yann at opencsw.org>  Sun, 27 Oct 2013 20:01:23 +0100
 

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