[csw-devel] SF.net SVN: gar:[2474] csw/mgar/pkg/openssl/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Dec 7 23:31:33 CET 2008
Revision: 2474
http://gar.svn.sourceforge.net/gar/?rev=2474&view=rev
Author: chninkel
Date: 2008-12-07 22:31:33 +0000 (Sun, 07 Dec 2008)
Log Message:
-----------
openssl: update to mGAR v2
Modified Paths:
--------------
csw/mgar/pkg/openssl/trunk/Makefile
csw/mgar/pkg/openssl/trunk/checksums
csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec
csw/mgar/pkg/openssl/trunk/files/changelog.CSW
csw/mgar/pkg/openssl/trunk/files/i.conf
csw/mgar/pkg/openssl/trunk/files/oldlibs.0.9.7m-sparc.tar.gz
csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch
csw/mgar/pkg/openssl/trunk/files/r.conf
Added Paths:
-----------
csw/mgar/pkg/openssl/trunk/files/certs.tar.gz
Removed Paths:
-------------
csw/mgar/pkg/openssl/trunk/checksums.0.9.7m
Property Changed:
----------------
csw/mgar/pkg/openssl/trunk/
Property changes on: csw/mgar/pkg/openssl/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,29 +1,5 @@
-# Beware, this Makefile is complex because:
-# - we must also build and include in the package the
-# libraries of the previous version for comptability reason
-#
-# - we also build optimized libraries (amd64, pentium_pro, sparcv9, ...)
-#
-#
-# On x86, amd64 libraries/binaries must be build on Solaris 10 whereas the
-# other ones must be built on Solaris 8, so the packaging process must be
-# split in two steps and must use a nfs shared directory.
-#
-# - first, on Solaris 10, build only the amd64 optimized binaries/libraries:
-#
-# gmake COOKIEROOTDIR="$NFS_SHARED_DIR/cookie" DESTROOT="$NFS_SHARED_DIR" DESTIMG=$LOGNAME-$HOST8 GAROSREL=5.8 ISA=amd64 install-libs install-bin
-#
-# - then on solaris 8, finish the build and packaging process:
-#
-# gmake COOKIEROOTDIR="$NFS_SHARED_DIR/cookie" DESTROOT="$NFS_SHARED_DIR" package
-#
-# NFS_SHARED_DIR is the path of the directory nfs shared between the solaris 10
-# and the solaris 8 host
-# HOST8 is the hostname of the Solaris 8 host
-#
-#
GARNAME = openssl
-GARVERSION = 0.9.8g
+GARVERSION = 0.9.8i
CATEGORIES = lib
OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g')
@@ -53,25 +29,24 @@
SPKG_CLASSES = none conf
-# We will include the following previous versions of libraries
-# for comptatibility reasons
-OLDLIBS = 0.9.7m
-DISTFILES += oldlibs.list.0.9.7m-i386
-DISTFILES += oldlibs.list.0.9.7m-sparc
-0.9.7m_i386_ISALIST = pentium_pro
-0.9.7m_sparc_ISALIST = sparcv8plus+vis sparcv9
-
PATCHFILES = openssl.$(OPENSSL_VERSION).patch
+GARCOMPILER = SOS11
+
# The list of instructions set for which we will
# provide optimized libraries and binaries
-i386_ISALIST = pentium_pro amd64
-sparc_ISALIST = sparcv8plus+vis sparcv9
+EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
+EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9
-ifdef OLDLIB
-i386_ISALIST = pentium_pro
-endif
+# we don't yet use isaexec support so we disable
+# isa relocation for default isa
+NO_ISAEXEC = 1
+#ISA_RELOCATE_DIRS_i386 =
+#ISA_RELOCATE_DIRS_sparcv8 =
+# we redefine the default merge exclude so *.a files are not excluded
+MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR)
+
# The corresponding os/compiler to pass to the
# openssl Configure script
i386_OS_COMPILER = solaris-386-cc
@@ -79,104 +54,39 @@
pentium_pro_OS_COMPILER = solaris-pentium_pro-cc
amd64_OS_COMPILER = solaris64-x86_64-cc
-sparc_OS_COMPILER = solaris-sparcv8-cc
+sparcv8_OS_COMPILER = solaris-sparcv8-cc
sparcv8plus_OS_COMPILER = solaris-sparcv9-cc
sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc
sparcv9_OS_COMPILER = solaris64-sparcv9-cc
-# Let's determine the appropriate os/compiler couple
-# to pass to the openssl Configure script
-ifndef ISA
-OS_COMPILER = $($(GARCH)_OS_COMPILER)
-else
-OS_COMPILER = $($(ISA)_OS_COMPILER)
-endif
+CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR)
-CONFIGURE_ARGS = --prefix=$(prefix) shared $(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
-#
+
# By default, the install target put man pages under
# /opt/csw/ssl/man, but we want them under /opt/csw/share/man
INSTALL_ARGS += MANDIR=$(mandir)
-POST_INSTALL_TARGETS := striplib
+# we include previous release of libraries file for comptability purpose
+OLDLIBS = 0.9.7m
-#########################################################################
-# Makefile instructions to handle additional optimized libraries and binaries (part I)
-#
-# To enable optimized libraries/binaries:
-# - define the i386_ISALIST and sparc_ISALIST with the instructions
-# sets additionnal binaries and librairies should be optimized for
-# - define the install-libs and install-bin targets which should
-# install binaries and libraries in $(bindir)/$(ISA) and $(libdir)/$(ISA)
-#
-# To just build the non-optimized binaries/libraries:
-# gmake ISALIST="" build
-#
-# To just build specific optimized binaries/libraries:
-# gmake ISA=instruction_set build
-#
-# This code could be added in the common gar scripts.
-#
-#########################################################################
+SKIPTEST = 1
-ifndef ISA
-ISALIST=$($(GARCH)_ISALIST)
-ifdef ISALIST
-CONFIGURE_SCRIPTS = $(WORKSRC)/configure isa
-BUILD_SCRIPTS = $(WORKSRC)/Makefile isa
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile isa
-TEST_SCRIPTS = $(WORKSRC)/Makefile isa
-CLEAN_SCRIPTS = all isa
-endif
-else
-# We want a separate work and cookie directory
-# for each optimized build
-WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(ISA).d
-COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(ISA).d
-endif
-
-#########################################################################
-
-#########################################################################
-# Makefile instructions to handle old libraries inclusion (part I)
-#
-# This should rather be handled by making a distinct package for each
-# incompatible library version.
-#########################################################################
-
-ifdef OLDLIB
-CHECKSUM_FILE = checksums.$(GARVERSION)
-ifdef ISA
-WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(ISA).$(GARVERSION).d
-COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(ISA).$(GARVERSION).d
-else
-WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(GARVERSION).d
-COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(GARVERSION).d
-endif
-endif
-
-ifdef OLDLIBS
-ifndef ISA
-INSTALL_SCRIPTS += oldlibs
-endif
-endif
-
-#########################################################################
-
-
include gar/category.mk
+# we redefine the timestamp to fulfill opencsw standard
+SPKG_VERSION := $(OPENSSL_VERSION)
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE)
-pre-configure:
+
+pre-configure-modulated:
echo " ==> Creating configure script"
cd $(WORKSRC) && ln -nf Configure configure
$(MAKECOOKIE)
@@ -184,104 +94,21 @@
# we remove every debug information except symbol table
# (should rather be done in the gar scripts)
striplib:
- chmod -R u+w $(DESTDIR)$(libdir)
- strip -x $(DESTDIR)$(libdir)/*.so*
- ( for ISA in $($(GARCH)_ISALIST); do \
- strip -x $(DESTDIR)$(libdir)/$$ISA/*.so*; \
- done )
- chmod -R u+w $(DESTDIR)$(libdir)/engines
- strip -x $(DESTDIR)$(libdir)/engines/*.so*
+ chmod -R u+w $(PKGROOT)$(libdir)
+ find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';'
-post-install:
- [ -f $(DESTDIR)$(prefix)/ssl/openssl.cnf ] && \
- ginstall -D $(DESTDIR)$(prefix)/ssl/openssl.cnf $(DESTDIR)$(sysconfdir)/ssl/openssl.cnf
- cp -r $(WORKSRC)/certs/* $(DESTDIR)$(prefix)/ssl/certs
+install-certs:
+ [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \
+ ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf
+ gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -)
+ cp -r $(WORKSRC)/certs/* $(PKGROOT)$(prefix)/ssl/certs
+ OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/
$(MAKECOOKIE)
-
-# These targets are required to provide optimized binaries/libraries
-
-install-libs: install-static-libs install-dynamic-libs
-
-install-static-libs: build
- @if test ! -f "$(COOKIEDIR)/install-static-libs"; then \
- echo " ==> Installing libraries from $(WORKSRC)"; \
- ginstall -d $(DESTDIR)$(libdir)/$(ISA); \
- cd $(WORKSRC) && ginstall libcrypto.a libssl.a $(DESTDIR)$(libdir)/$(ISA); \
- $(MAKECOOKIE); \
- fi
-
-install-dynamic-libs: build
- @if test ! -f $(COOKIEDIR)/install-dynamic-libs; then \
- echo " ==> Installing libraries from $(WORKSRC)"; \
- ginstall -d $(DESTDIR)$(libdir)/$(ISA); \
- cd $(WORKSRC) && ginstall libcrypto.so.$(OPENSSL_VERSION) libssl.so.$(OPENSSL_VERSION) $(DESTDIR)$(libdir)/$(ISA); \
- $(MAKECOOKIE); \
- fi
-
-install-bin: build
- @if test ! -f $(COOKIEDIR)/install-bin; then \
- echo " ==> Installing binaries from $(WORKSRC)"; \
- ginstall -d $(DESTDIR)$(bindir)/$(ISA); \
- cd $(WORKSRC) && ginstall apps/openssl $(DESTDIR)$(bindir)/$(ISA); \
- $(MAKECOOKIE); \
- fi
-
-
-
-#########################################################################
-# Makefile instructions to handle additional optimized libraries and binaries (part II)
-#
-#########################################################################
-
-configure-isa: $(addprefix configure-isa-,$(ISALIST))
-configure-isa-%:
- @$(MAKE) ISA=$* configure
-
-build-isa: $(addprefix build-isa-,$(ISALIST))
-build-isa-%:
- @$(MAKE) ISA=$* build
-
-test-isa: $(addprefix test-isa-,$(ISALIST))
-test-isa-%:
- @$(MAKE) ISA=$* test
-
-install-isa: $(addprefix install-isa-,$(ISALIST))
-install-isa-%:
- @$(MAKE) ISA=$* test install-libs install-bin
-
-clean-isa: $(addprefix clean-isa-,$(ISALIST))
-clean-isa-%:
- @$(MAKE) ISA=$* clean
-
-#########################################################################
-# Makefile instructions to handle old libraries inclusion (part II)
-#
-# This should rather be handled by making a distinct package for each
-# incompatible library version.
-#########################################################################
-
-update-oldlibs-archive: $(addprefix update-oldlibs-archive-,$(OLDLIBS))
-update-oldlibs-archive-%: clean-oldlibs-archive-% install-oldlibs-%
- @echo " ==> Creating old libraries archive oldlibs.$*-$(GARCH).tar.gz"
- @cd $(DESTDIR) && tar cvf - `cat $(CURDIR)/$(DOWNLOADDIR)/oldlibs.list.$*-$(GARCH)` | gzip > $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz
-
-clean-oldlibs-archive: $(addprefix clean-oldlibs-archive,$(OLDLIBS))
-clean-oldlibs-archive-%:
- @echo " ==> Removing old libraries archive oldlibs.$*-$(GARCH).tar.gz"
- @rm -f $(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz
- @rm -f $(COOKIEDIR)/install-oldlibs*
-
install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS))
-install-oldlibs-%:
- @if [ -f $(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz ]; then \
- echo " ==> Installing old libraries $* from existing old libraries archive oldlibs.$*-$(GARCH).tar.gz"; \
- cd $(DESTDIR) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf -; \
- else \
- echo " ==> Build old libraries $*"; \
- $(MAKE) GARVERSION=$* OLDLIB=1 build; \
- for ISA in "" $($(*)_$(GARCH)_ISALIST); do \
- $(MAKE) GARVERSION=$* OLDLIB=1 ISA=$$ISA install-dynamic-libs; \
- done; \
- fi
- @$(MAKECOOKIE)
+install-oldlibs-%:
+ echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \
+ cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \
+ $(MAKECOOKIE)
+
+pre-package: striplib install-certs install-oldlibs
Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,5 +1,5 @@
-acf70a16359bf3658bdfb74bda1c4419 download/openssl-0.9.8g.tar.gz
-3b17df33844577c449027ef309157fe7 download/CSWossl.gspec
+561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz
+bc7aa9d2ea44e9ac28b11db12402024e download/CSWossl.gspec
05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend
7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype
cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec
@@ -14,9 +14,7 @@
0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec
37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend
6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype
-f49c762973d9955b310be948900de148 download/changelog.CSW
-9b2ae27f98333b73ff2b16ed98ee896a download/i.conf
-5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf
-1b1b1aa37d3827f03320dc7c6b2d54ae download/oldlibs.list.0.9.7m-i386
-ba0db139be0aeecdce5668d2de475a4d download/oldlibs.list.0.9.7m-sparc
-a6475f97d8b1152e06679ba6ec463536 download/openssl.0.9.8.patch
+e3f149dea30df046b9042a69639bcf3b download/changelog.CSW
+7fdc09cd3c11db459c83c8946f7872f6 download/i.conf
+a454ac09091085813ec8900f5a0c917c download/r.conf
+64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch
Deleted: csw/mgar/pkg/openssl/trunk/checksums.0.9.7m
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums.0.9.7m 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/checksums.0.9.7m 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,22 +0,0 @@
-74a4d1b87e1e6e1ec95dbe58cb4c5b9a download/openssl-0.9.7m.tar.gz
-3b17df33844577c449027ef309157fe7 download/CSWossl.gspec
-05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend
-7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype
-cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec
-78c26f65b14f3ebf4a29069a3f675285 download/CSWosslrt.checkinstall
-d41d8cd98f00b204e9800998ecf8427e download/CSWosslrt.depend
-cba143e52cb08dd3ee39f275aefa075d download/CSWosslrt.prototype-i386
-ceeb4a59f1c31ae4deac9f2b61dadca2 download/CSWosslrt.prototype-sparc
-1791edde7bf1bce62ac799852459dc47 download/CSWossldevel.gspec
-37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend
-45161ff3a5b00fd6942f63b77c0b0ed1 download/CSWossldevel.prototype-i386
-7b1dd2e8c78b033ca2a8be4de097b147 download/CSWossldevel.prototype-sparc
-0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec
-37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend
-6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype
-f49c762973d9955b310be948900de148 download/changelog.CSW
-9b2ae27f98333b73ff2b16ed98ee896a download/i.conf
-5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf
-1b1b1aa37d3827f03320dc7c6b2d54ae download/oldlibs.list.0.9.7m-i386
-ba0db139be0aeecdce5668d2de475a4d download/oldlibs.list.0.9.7m-sparc
-45f0944761a63ba5211987dbfbfdfc42 download/openssl.0.9.7.patch
Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,5 +1,6 @@
%var bitname openssl
%var pkgname CSWossl
+%var arch all
%var desc Openssl meta package
%var pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg
%include url file://%{PKGLIB}/csw_dyndepend.gspec
Added: csw/mgar/pkg/openssl/trunk/files/certs.tar.gz
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/openssl/trunk/files/certs.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,3 +1,11 @@
+openssl (0.9.8,REV=2008.10.05_rev=i) unstable
+
+ * New upstream version.
+ * Added CA certs that were removed in 0.9.8h.
+ * Fixed ARCH in openssl meta-package.
+
+ -- Yann Rouillard <yann at opencsw.org> Fri, 05 Oct 2008 21:25:09 +0200
+
openssl (0.9.8,REV=2007.12.26_rev=g) unstable
* Fixed inconsistency between headers and libraries.
Modified: csw/mgar/pkg/openssl/trunk/files/i.conf
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/i.conf 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/files/i.conf 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Yann Rouillard <yann at blastwave.org>
+# Copyright 2006 Yann Rouillard <yann at opencsw.org>
# All rights reserved. Use is subject to license terms.
#
# Redistribution and/or use, with or without modification, is
@@ -15,7 +15,7 @@
# with .CSW
# except for service configuration files which are always installed
# CSW suffixed under Solaris 9 as they are used to enable/disable
-# a service according to blastwave standards.
+# a service according to opencsw standards.
#
umask 0022
Modified: csw/mgar/pkg/openssl/trunk/files/oldlibs.0.9.7m-sparc.tar.gz
===================================================================
(Binary files differ)
Modified: csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,7 +1,7 @@
-diff --speed-large-files --minimal -Nru openssl-0.9.8e.orig/Configure openssl-0.9.8e/Configure
---- openssl-0.9.8e.orig/Configure 2006-11-30 09:01:38.000000000 -0500
-+++ openssl-0.9.8e/Configure 2007-05-08 10:27:21.506853000 -0400
-@@ -194,8 +194,12 @@
+diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure
+--- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200
++++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200
+@@ -199,8 +199,12 @@
"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 BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### Solaris x86 with Sun C setups
@@ -16,12 +16,11 @@
#### 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)",
-@@ -214,6 +218,7 @@
+@@ -219,6 +223,7 @@
"solaris-sparcv7-cc","cc:-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:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"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.o:des_enc-sparc.o fcrypt_b.o:::::::::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::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::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::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::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:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
+ "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::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::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::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::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:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::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 -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.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-set
Modified: csw/mgar/pkg/openssl/trunk/files/r.conf
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/r.conf 2008-12-07 17:33:28 UTC (rev 2473)
+++ csw/mgar/pkg/openssl/trunk/files/r.conf 2008-12-07 22:31:33 UTC (rev 2474)
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Yann Rouillard <yann at blastwave.org>
+# Copyright 2006 Yann Rouillard <yann at opencsw.org>
# All rights reserved. Use is subject to license terms.
#
# Redistribution and/or use, with or without modification, is
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