[csw-devel] SF.net SVN: gar:[15209] csw/mgar/pkg/openssl1/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Jul 24 03:39:52 CEST 2011
Revision: 15209
http://gar.svn.sourceforge.net/gar/?rev=15209&view=rev
Author: chninkel
Date: 2011-07-24 01:39:52 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
openssl1: Makefile simplficiation
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/Makefile
csw/mgar/pkg/openssl1/trunk/checksums
csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch
csw/mgar/pkg/openssl1/trunk/files/README.CSW
csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch
Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile 2011-07-24 01:37:59 UTC (rev 15208)
+++ csw/mgar/pkg/openssl1/trunk/Makefile 2011-07-24 01:39:52 UTC (rev 15209)
@@ -13,7 +13,7 @@
###### Package information #######
NAME = openssl
-VERSION = 1.0.0c
+VERSION = 1.0.0d
CATEGORIES = lib
SONAME=$(shell echo $(VERSION) | tr -d '[a-z]')
@@ -27,36 +27,28 @@
PACKAGES = CSWlibssl1-0-0 CSWlibssl1-0-0-devel CSWopenssl1-utils
-CATALOGNAME_CSWlibssl1-0-0 = libssl1_0_0
-RUNTIME_DEP_PKGS_CSWlibssl1-0-0 = CSWcacertificates
SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries
PKGFILES_CSWlibssl1-0-0 = $(libdir).*\.so(\.\d+)*
-PKGFILES_CSWlibssl1-0-0 += $(sysconfdir)/etc/ssl/private $(prefix)/ssl/private $(prefix)/ssl/certs /etc/$(prefix)/ssl/private
+PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs
PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.*
-CATALOGNAME_CSWlibssl1-0-0-devel = libssl1_0_0_devel
RUNTIME_DEP_PKGS_CSWlibssl1-0-0-devel = CSWlibssl1-0-0
SPKG_DESC_CSWlibssl1-0-0-devel = Openssl 1.0 development support files
PKGFILES_CSWlibssl1-0-0-devel = $(PKGFILES_DEVEL)
PKGFILES_CSWlibssl1-0-0-devel += $(docdir)/libssl1_0_0_devel/.*
-CATALOGNAME_CSWopenssl1-utils = openssl1_utils
RUNTIME_DEP_PKGS_CSWopenssl1-utils = CSWlibssl1-0-0
SPKG_DESC_CSWopenssl1-utils = Openssl 1.0 binaries and related tools
-SPKG_CLASSES_CSWopenssl1-utils = none cswpreserveconf
PKGFILES_CSWopenssl1-utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.*
PKGFILES_CSWopenssl1-utils += $(prefix)/ssl/misc/.*
-PKGFILES_CSWopenssl1-utils += $(prefix)/ssl/openssl\.cnf $(sysconfdir)/ssl/openssl\.cnf.*
+PKGFILES_CSWopenssl1-utils += $(prefix)/etc/ssl/openssl\.cnf.*
PKGFILES_CSWopenssl1-utils += $(docdir)/openssl1_utils/.*
+PRESERVECONF = $(prefix)/etc/ssl/openssl.cnf
-PRESERVECONF = $(sysconfdir)/ssl/openssl.cnf
-
# We use SUN perl, not the opencsw one
CHECKPKG_OVERRIDES_CSWopenssl1-utils += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += surplus-dependency|CSWcacertificates
-
# We ship the .a files in the devel package
CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
@@ -87,19 +79,12 @@
CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/FAQ
CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/INSTALL
-# We share /opt/csw/lib/ssl
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += missing-dependency|CSWosslrt
-
-
include checkpkg.overrides
###### Upstream and opencsw files information #######
-MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/
+MASTER_SITES = http://www.openssl.org/source/
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*[a-z]?).tar.gz
-
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += CSWlibssl1-0-0.checkinstall CSWlibssl1-0-0.preinstall CSWlibssl1-0-0.postinstall
DISTFILES += changelog.CSW README.CSW
@@ -110,11 +95,6 @@
# solaris-pentium_pro-cc and solaris-sparcv9+vis-cc
PATCHFILES = more_configure_targets.patch
-# Since 1.0.0, openssl tries to install x64 libraries in $(prefix)/64 directory
-# we prefer to rely on gar system to take of this so we remove this using this
-# patch
-PATCHFILES += dont_use_slash_64_directory.patch
-
#PATCHFILES += fix-test-failure.patch
# We install engines libraries in /opt/csw/lib/engines/1.0.0/
@@ -134,16 +114,11 @@
EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9
-# GAR wants and puts sparcv9 in lib/64 but openssl build system
-# isn't the standard autoconf/automake one so we disable this
-# relocation for now
-ISALIBDIR_sparcv9 = .
-libdir = /opt/csw/lib
-
# we include *.a files in the devel package so we don't want them excluded
MERGE_EXCLUDE_STATICLIBS =
-EXTRA_MERGE_DIRS_isa-$(ISA) = /opt/csw/lib/engines/
+# No .so files in libraries
+EXTRA_MERGE_EXCLUDE_FILES = .*/libcrypto.so .*/libssl.so
# The corresponding os/compiler to pass to the
# openssl Configure script
@@ -157,14 +132,13 @@
sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc
sparcv9_OS_COMPILER = solaris64-sparcv9-cc
-CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR)
+CONFIGURE_ARGS = --prefix=$(prefix) --openssldir=$(prefix)/etc/ssl shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR)
# We want the csw perl to be used
#CONFIGURE_ENV += PERL="/opt/csw/bin/perl"
# For now we want the sun perl to be used
CONFIGURE_ENV += PERL="/usr/bin/perl"
-
# Some optimization
EXT_CFLAGS += -mt -xstrconst
EXT_CXXFLAGS += -noex -mt
@@ -177,54 +151,17 @@
include gar/category.mk
-
pre-configure-modulated:
echo " ==> Creating configure script"
cd $(WORKSRC) && ln -nf Configure configure
@$(MAKECOOKIE)
-# we remove every debug information except symbol table
-# (should rather be done in the gar scripts)
-post-install-modulated:
- echo " ==> Stripping libraries"
- chmod -R u+w $(DESTDIR)$(libdir)
- find $(DESTDIR)$(libdir) -name "*.so*" -exec strip -x '{}' ';'
-
-install-changelog:
+merge-doc:
for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \
- ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/changelog.CSW; \
- done
- @$(MAKECOOKIE)
-
-install-doc:
- for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \
ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \
+ (cd $(DOWNLOADDIR)/ && ginstall README.CSW changelog.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \
(cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \
- ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \
done
@$(MAKECOOKIE)
-install-certs:
- [ ! -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] || \
- ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW
- ginstall -d $(PKGROOT)/etc/$(prefix)/ssl/private
- rm -rf $(PKGROOT)/$(prefix)/ssl/openssl.cnf && ln -s ../etc/ssl/openssl.cnf $(PKGROOT)/$(prefix)/ssl/openssl.cnf
- rm -rf $(PKGROOT)/$(prefix)/ssl/certs && ln -s ../etc/ssl/certs $(PKGROOT)/$(prefix)/ssl/certs
- rm -rf $(PKGROOT)/$(prefix)/ssl/private && ln -s ../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/ssl/private
- @$(MAKECOOKIE)
-
-remove-generic-so-files:
- gfind $(PKGROOT)/$(libdir) -name "libcrypto.so" -exec rm '{}' ';'
- gfind $(PKGROOT)/$(libdir) -name "libssl.so" -exec rm '{}' ';'
-
-move-engines-libraries:
- for ISA in "" $(EXTRA_BUILD_ISAS_$(GARCH)); do \
- ginstall -d "$(PKGROOT)/$(libdir)/openssl-$(SONAME)/engines/$$ISA"; \
- ( cd $(PKGROOT)/$(libdir)/engines/$$ISA; \
- for FILE in *; do \
- [ -f "$$FILE" ] || continue; \
- mv "$$FILE" $(SONAME)/; \
- done ); \
- done
-
-pre-package: install-certs install-changelog install-doc remove-generic-so-files move-engines-libraries
+post-merge: merge-doc
Modified: csw/mgar/pkg/openssl1/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl1/trunk/checksums 2011-07-24 01:37:59 UTC (rev 15208)
+++ csw/mgar/pkg/openssl1/trunk/checksums 2011-07-24 01:39:52 UTC (rev 15209)
@@ -1 +1 @@
-ff8fb85610aef328315a9decbb2712e4 openssl-1.0.0c.tar.gz
+40b6ea380cc8a5bf9734c2f8bf7e701e openssl-1.0.0d.tar.gz
Modified: csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch 2011-07-24 01:37:59 UTC (rev 15208)
+++ csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch 2011-07-24 01:39:52 UTC (rev 15209)
@@ -1,3 +1,17 @@
+From 19481ff83894faf3b114dd7c460be7ca2b8dcea2 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 24 Jul 2011 02:18:21 +0200
+Subject: [PATCH] Make engines directory soname dependant
+
+---
+ Configure | 2 +-
+ Makefile.org | 3 ++-
+ engines/Makefile | 10 +++++-----
+ engines/ccgost/Makefile | 8 ++++----
+ 4 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/Configure b/Configure
+index 17b3648..f7e2e0e 100755
--- a/Configure
+++ b/Configure
@@ -1690,7 +1690,7 @@ while (<IN>)
@@ -9,3 +23,80 @@
$foo =~ s/\\/\\\\/g;
print OUT "#define ENGINESDIR \"$foo\"\n";
}
+diff --git a/Makefile.org b/Makefile.org
+index fb0af7e..c9edd8f 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -194,6 +194,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
+ ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \
+ EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \
+ SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \
++ SHLIB_VERSION_NUMBER='$(SHLIB_VERSION_NUMBER)' \
+ PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)' \
+ CPUID_OBJ='$(CPUID_OBJ)' \
+ BN_ASM='$(BN_ASM)' DES_ENC='$(DES_ENC)' \
+@@ -497,7 +498,7 @@ install: all install_docs install_sw
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+diff --git a/engines/Makefile b/engines/Makefile
+index 2fa9534..16554ea 100644
+--- a/engines/Makefile
++++ b/engines/Makefile
+@@ -107,7 +107,7 @@ install:
+ @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+ @if [ -n "$(SHARED_LIBS)" ]; then \
+ set -e; \
+- $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
++ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines; \
+ for l in $(LIBNAMES); do \
+ ( echo installing $$l; \
+ pfx=lib; \
+@@ -119,13 +119,13 @@ install:
+ *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
+ *) sfx=".bad";; \
+ esac; \
+- cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
++ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$$pfx$$l$$sfx.new; \
+ else \
+ sfx=".so"; \
+- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
++ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$$pfx$$l$$sfx.new; \
+ fi; \
+- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$$pfx$$l$$sfx.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$$pfx$$l$$sfx ); \
+ done; \
+ fi
+ @target=install; $(RECURSIVE_MAKE)
+diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
+index dadb523..e71e6f5 100644
+--- a/engines/ccgost/Makefile
++++ b/engines/ccgost/Makefile
+@@ -53,13 +53,13 @@ install:
+ *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
+ *) sfx=".bad";; \
+ esac; \
+- cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+ else \
+ sfx=".so"; \
+- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+ fi; \
+- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-$(SHLIB_VERSION_NUMBER)/engines/$${pfx}$(LIBNAME)$$sfx; \
+ fi
+
+ links:
+--
+1.7.6
+
Modified: csw/mgar/pkg/openssl1/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/README.CSW 2011-07-24 01:37:59 UTC (rev 15208)
+++ csw/mgar/pkg/openssl1/trunk/files/README.CSW 2011-07-24 01:39:52 UTC (rev 15209)
@@ -18,6 +18,3 @@
new certificates.
See /opt/csw/share/doc/ca_certificates/README.CSW for more details.
-For comptability purpose, the openssl_rt package depends on the ca_certificates
-packages
-
Modified: csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch 2011-07-24 01:37:59 UTC (rev 15208)
+++ csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch 2011-07-24 01:39:52 UTC (rev 15209)
@@ -4,13 +4,22 @@
Subject: [PATCH] Don't use /64 directory when installing libraries
---
- Configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Configure | 8 +-
+ 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Configure b/Configure
index d59f117..7f38214 100755
--- a/Configure
+++ b/Configure
+@@ -214,7 +214,7 @@
+ # actually recommend to consider using gcc shared build even with vendor
+ # compiler:-)
+ # <appro at fy.chalmers.se>
+-"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
++"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):",
+
+ #### Solaris x86 with Sun C setups
+ "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -219,7 +219,7 @@ my %table=(
#### Solaris x86 with Sun C setups
"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -20,6 +29,24 @@
#### SPARC Solaris with GNU C setups
"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -226,7 +226,7 @@
+ "solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
+ "solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
++"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ ####
+ "debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -239,7 +239,7 @@
+ "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64",
++"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::",
+ ####
+ "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--
1.7.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list