OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Steffen Weinreich
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Sep-2005 23:54:55
Branch: HEAD Handle: 2005092822545400
Modified files:
openpkg-src/openssl openssl.spec
Log:
Forced the use of -fPIC on amd64 and ia64 systems. Disabled the use
of assembler on amd64 systems to circumvent a problem with the
assembler code and the -fPIC option.
Summary:
Revision Changes Path
1.69 +20 -11 openpkg-src/openssl/openssl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 openssl.spec
--- openpkg-src/openssl/openssl.spec 3 Aug 2005 20:32:53 -0000 1.68
+++ openpkg-src/openssl/openssl.spec 28 Sep 2005 21:54:54 -0000 1.69
@@ -33,7 +33,7 @@
Group: Cryptography
License: BSD-style
Version: 0.9.8
-Release: 20050803
+Release: 20050928
# package options
%option with_zlib no
@@ -94,26 +94,35 @@
%build
%{l_prefix}/bin/perl util/perlpath.pl %{l_prefix}/bin/perl
PERL=%{l_prefix}/bin/perl \
- ./config \
- --prefix=%{l_prefix} \
- --openssldir=%{l_prefix}/etc/openssl \
+ options="no-shared no-dso"
%if "%{with_pic}" == "yes"
- -fPIC \
+ options="$options -fPIC"
+ case "%{l_platform -t}" in
+ amd64-* ) options="$options no-asm" ;;
+ esac
+%else
+ case "%{l_platform -t}" in
+ amd64-* ) options="$options -fPIC no-asm" ;;
+ ia64-* ) options="$options -fPIC" ;;
+ esac
%endif
- no-shared no-dso \
%if "%{with_zlib}" == "yes"
- zlib \
+ options="$options zlib"
%else
- no-zlib \
+ options="$options no-zlib"
%endif
%if "%{with_idea}" != "yes"
- no-idea \
+ options="$options no-idea"
%endif
%if "%{with_threads}" == "yes"
- threads
+ options="$options threads"
%else
- no-threads
+ options="$options no-threads"
%endif
+ ./config \
+ --prefix=%{l_prefix} \
+ --openssldir=%{l_prefix}/etc/openssl \
+ $options
%{l_make} %{l_mflags}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
