summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-07-06 02:07:05 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-07-06 02:07:05 +0000
commit7fbd5a5aeae5a21c5d7c176a5f750f2dc45d37af (patch)
tree6ccbfc14caf3f5a9a1d3e93fb8126977f9af6548 /dev-libs
parentversion bump (diff)
downloadgentoo-2-7fbd5a5aeae5a21c5d7c176a5f750f2dc45d37af.tar.gz
gentoo-2-7fbd5a5aeae5a21c5d7c176a5f750f2dc45d37af.tar.bz2
gentoo-2-7fbd5a5aeae5a21c5d7c176a5f750f2dc45d37af.zip
Remove custom config stuff as asked in gentoo.config-0.9.7g - bug #98072 responsible.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/openssl/ChangeLog6
-rw-r--r--dev-libs/openssl/openssl-0.9.8.ebuild14
2 files changed, 7 insertions, 13 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index b33ca44cc90e..a71b74949e0d 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/openssl
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.127 2005/07/05 23:45:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.128 2005/07/06 02:07:05 azarah Exp $
+
+ 06 Jul 2005; Martin Schlemmer <azarah@gentoo.org> openssl-0.9.8.ebuild:
+ Remove custom config stuff as asked in gentoo.config-0.9.7g - bug #98072
+ responsible.
05 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
openssl-0.9.7c-r1.ebuild, openssl-0.9.7d-r2.ebuild, openssl-0.9.7e.ebuild,
diff --git a/dev-libs/openssl/openssl-0.9.8.ebuild b/dev-libs/openssl/openssl-0.9.8.ebuild
index fca3699be4b6..85414579dd8f 100644
--- a/dev-libs/openssl/openssl-0.9.8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8.ebuild,v 1.1 2005/07/05 23:39:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8.ebuild,v 1.2 2005/07/06 02:07:05 azarah Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -32,10 +32,6 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-0.9.8-parallel-build.patch
epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
- # allow openssl to be cross-compiled
- cp "${FILESDIR}"/gentoo.config-0.9.7g gentoo.config || die "cp cross-compile failed"
- chmod a+rx gentoo.config
-
case $(gcc-version) in
3.2)
filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loop
@@ -83,13 +79,7 @@ src_compile() {
local confopts=""
use bindist && confopts="no-idea no-rc5 no-mdc2 -no-ec"
- local sslout=$(./gentoo.config)
- einfo "Use configuration ${sslout}"
-
- local config="Configure"
- [[ -z ${sslout} ]] && config="config"
- ./${config} \
- ${sslout} \
+ ./config \
${confopts} \
--prefix=/usr \
--openssldir=/etc/ssl \