SF.net SVN: gar:[26189] csw/mgar/pkg/openssl1/branches/lts102/Makefile

[rmottola at users.sourceforge.net]

Revision: 26189
          http://sourceforge.net/p/gar/code/26189
Author:   rmottola
Date:     2017-05-08 22:44:34 +0000 (Mon, 08 May 2017)
Log Message:
-----------
openssl1/branches/lts102: do not use tweaked options on most targets, rise default ISA instead of EXTRA, tweak sol. 9 to skip amd64

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-05 06:35:13 UTC (rev 26188)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile	2017-05-08 22:44:34 UTC (rev 26189)
@@ -162,13 +162,21 @@
 
 ##### Build and installation information #####
 
-BUILD64 = 1
+# Do not build a unified 32/64 bit package for Solaris 9 i386
+BUILD64-sparc-5.9 = 1
+BUILD64-sparc-5.10 = 1
+BUILD64-i386-5.10 = 1
+BUILD64 = $(BUILD64-$(GARCH)-$(GAROSREL))
+
+ISA_DEFAULT_i386-5.9 = pentium_pro
+ISA_DEFAULT_sparc-5.9 = sparcv8plus
+
 ISAEXEC = 1
 
 # The list of instructions set for which we will
 # provide optimized libraries and binaries
-EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
-EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9
+#EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
+#EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9
 
 
 # the openssl build system doesn't honor bindir
@@ -184,7 +192,7 @@
 # The corresponding os/compiler to pass to the
 # openssl Configure script
 i386_SUN_CONFIGURE_TARGET		= no-sse2 solaris-x86-cc-sunw
-pentium_pro_SUN_CONFIGURE_TARGET	= solaris-x86-cc-sunw
+pentium_pro_SUN_CONFIGURE_TARGET	= solaris-x86-cc
 amd64_SUN_CONFIGURE_TARGET	 	= solaris64-x86_64-cc-sunw
 
 i386_GNU_CONFIGURE_TARGET       	= no-sse2 solaris-x86-gcc
@@ -192,11 +200,11 @@
 amd64_GNU_CONFIGURE_TARGET		= solaris64-x86_64-gcc
 
 sparcv8_SUN_CONFIGURE_TARGET		= solaris-sparcv8-cc
-sparcv8plus_SUN_CONFIGURE_TARGET	= solaris-sparcv9-cc-sunw
+sparcv8plus_SUN_CONFIGURE_TARGET	= solaris-sparcv9-cc
 sparcv8plus+vis_SUN_CONFIGURE_TARGET	= solaris-sparcv9+vis-cc-sunw
 sparcv9_SUN_CONFIGURE_TARGET_5.11	= solaris64-sparcv9-cc-sunw
-sparcv9_SUN_CONFIGURE_TARGET_5.10	= solaris64-sparcv9-cc-sunw10
-sparcv9_SUN_CONFIGURE_TARGET_5.9	= solaris64-sparcv9-cc-sunw10
+sparcv9_SUN_CONFIGURE_TARGET_5.10	= solaris64-sparcv9-cc
+sparcv9_SUN_CONFIGURE_TARGET_5.9	= solaris64-sparcv9-cc
 sparcv9_SUN_CONFIGURE_TARGET		= $(sparcv9_SUN_CONFIGURE_TARGET_$(GAROSREL))
 
 sparcv8_GNU_CONFIGURE_TARGET		= solaris-sparcv8-gcc

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