Accepting request 32358 from Base:System

Copy from Base:System/openssl based on submit request 32358 from user coolo

OBS-URL: https://build.opensuse.org/request/show/32358
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=30
This commit is contained in:
OBS User autobuild 2010-02-18 15:49:00 +00:00 committed by Git OBS Bridge
parent 7227fc370f
commit 823face082
3 changed files with 31 additions and 2 deletions

17
openssl-allow-arch.diff Normal file
View File

@ -0,0 +1,17 @@
---
Configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: openssl-0.9.8k/Configure
===================================================================
--- openssl-0.9.8k.orig/Configure
+++ openssl-0.9.8k/Configure
@@ -857,7 +857,7 @@ PROCESS_ARGS:
}
else
{
- die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
+ warn "target already defined - $target (offending arg: $_)\n" if ($target ne "");
$target=$_;
}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 5 01:24:55 UTC 2010 - jengelh@medozas.de
- build openssl for sparc64
-------------------------------------------------------------------
Mon Dec 14 16:11:11 CET 2009 - jengelh@medozas.de

View File

@ -32,7 +32,7 @@ Obsoletes: openssl-64bit
%endif
#
Version: 0.9.8k
Release: 4
Release: 5
Summary: Secure Sockets and Transport Layer Security
Url: http://www.openssl.org/
Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2
@ -53,6 +53,7 @@ Patch8: func-parm-err.patch
Patch9: disable-optimization-for-s390x.diff
%endif
Patch10: bug-526319_openssl-0.9.8k-no-extssl.patch
Patch11: openssl-allow-arch.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -194,6 +195,7 @@ Authors:
%patch9
%endif
%patch10 -p1
%patch -P 11 -p1
cp -p %{S:10} .
# lib64 installation fixes
for i in Makefile.org engines/Makefile; do
@ -264,7 +266,12 @@ $RPM_OPT_FLAGS \
# LD_LIBRARY_PATH=`pwd` make rehash
# LD_LIBRARY_PATH=`pwd` make test
#%else
./config $config_flags
./config \
%ifarch sparc64
# OpenSSL relies on uname -m (not good). Thus this hack.
linux64-sparcv9 \
%endif
$config_flags
make depend
make
LD_LIBRARY_PATH=`pwd` make rehash