jonathan/openssl
1
0
Fork 0
forked from rpms/openssl
Code Pull Requests Activity

sparc handling

Browse Source
This commit is contained in:
Tom Callaway 2008-05-20 15:16:15 +00:00
parent dfabafc476
commit 3bbf540789
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openssl.spec
View File

@ -14,7 +14,7 @@
# Arches on which we need to prevent arch conflicts on opensslconf.h, must # Arches on which we need to prevent arch conflicts on opensslconf.h, must
# also be handled in opensslconf-new.h. # also be handled in opensslconf-new.h.
%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 sparc64 x86_64
# Arches for which we don't build subpackages. # Arches for which we don't build subpackages.
%define optimize_arches i686 %define optimize_arches i686
@ -22,7 +22,7 @@
Summary: The OpenSSL toolkit Summary: The OpenSSL toolkit
Name: openssl Name: openssl
Version: 0.9.8g Version: 0.9.8g
Release: 6%{?dist} Release: 7%{?dist}
# We remove certain patented algorithms from the openssl source tarball # We remove certain patented algorithms from the openssl source tarball
# with the hobble-openssl script which is included below. # with the hobble-openssl script which is included below.
Source: openssl-%{version}-usa.tar.bz2 Source: openssl-%{version}-usa.tar.bz2
@ -142,10 +142,14 @@ if ! echo %{_target} | grep -q i686 ; then
sslflags="no-asm 386" sslflags="no-asm 386"
fi fi
%endif %endif
%ifarch sparc %ifarch sparcv9
sslarch=linux-sparcv9 sslarch=linux-sparcv9
sslflags=no-asm sslflags=no-asm
%endif %endif
%ifarch sparc64
sslarch=linux64-sparcv9
sslflags=no-asm
%endif
%ifarch alpha alphaev56 alphaev6 alphaev67 %ifarch alpha alphaev56 alphaev6 alphaev67
sslarch=linux-alpha-gcc sslarch=linux-alpha-gcc
%endif %endif
@ -286,6 +290,12 @@ basearch=%{_arch}
%ifarch %{ix86} %ifarch %{ix86}
basearch=i386 basearch=i386
%endif %endif
%ifarch sparcv9
basearch=sparc
%endif
%ifarch sparc64
basearch=sparc64
%endif
%ifarch %{multilib_arches} %ifarch %{multilib_arches}
# Do an opensslconf.h switcheroo to avoid file conflicts on systems where you # Do an opensslconf.h switcheroo to avoid file conflicts on systems where you
@ -369,6 +379,9 @@ rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Mon May 19 2008 Tom "spot" Callaway <tcallawa@redhat.com> 0.9.8g-7
- sparc handling
* Mon Mar 10 2008 Joe Orton <jorton@redhat.com> 0.9.8g-6 * Mon Mar 10 2008 Joe Orton <jorton@redhat.com> 0.9.8g-6
- update to new root CA bundle from mozilla.org (r1.45) - update to new root CA bundle from mozilla.org (r1.45)

4
opensslconf-new.h
View File

@ -21,6 +21,10 @@
#include "opensslconf-s390x.h" #include "opensslconf-s390x.h"
#elif defined(__s390__) #elif defined(__s390__)
#include "opensslconf-s390.h" #include "opensslconf-s390.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "opensslconf-sparc64.h"
#elif defined(__sparc__)
#include "opensslconf-sparc.h"
#elif defined(__x86_64__) #elif defined(__x86_64__)
#include "opensslconf-x86_64.h" #include "opensslconf-x86_64.h"
#else #else