summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2006-03-07 22:01:43 +0000
committerMarkus Dittrich <markusle@gentoo.org>2006-03-07 22:01:43 +0000
commit1bc6b09d4d6014bc79aa48808d93948d4fe961b3 (patch)
treeb58f165f53a22253541b665ca4576021a4dd9449 /sci-libs
parentimported ebuild from gentoo.de CVS (diff)
downloadhistorical-1bc6b09d4d6014bc79aa48808d93948d4fe961b3.tar.gz
historical-1bc6b09d4d6014bc79aa48808d93948d4fe961b3.tar.bz2
historical-1bc6b09d4d6014bc79aa48808d93948d4fe961b3.zip
Disabled building of shared libraries on k7 architecture.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/fftw/ChangeLog7
-rw-r--r--sci-libs/fftw/Manifest12
-rw-r--r--sci-libs/fftw/fftw-3.1.ebuild11
3 files changed, 20 insertions, 10 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index ee9b574c91fd..3de085bcde52 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/fftw
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.28 2006/03/05 12:21:11 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.29 2006/03/07 22:01:43 markusle Exp $
+
+ 07 Mar 2006; Markus Dittrich <markusle@gentoo.org> fftw-3.1.ebuild:
+ Disabled building of shared libraries on k7 architecture. Thanks
+ much to Andreas Mann <A-Mann@gmx.de> and Ruediger Sassmannshausen
+ <rsassman@gmx.de> for their fixes. This closes bug #125218.
05 Mar 2006; Markus Dittrich <markusle@gentoo.org> ChangeLog:
Removed fftw-3.1 from package.mask.
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index fcf29c6f13bd..fcb0f37d4d12 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,6 +1,6 @@
-MD5 46e4ea9bafa348c18677b4c3b887e097 ChangeLog 7566
-RMD160 49ed9696fb7c1bb804ad1dbd625acfd52256c45a ChangeLog 7566
-SHA256 60b55fdd21979d7eb679fa062bc2f4d87e1f39bafa4371d211011611d7e7b4fd ChangeLog 7566
+MD5 c60615bbe1e3d6b3b3f8d79c41184726 ChangeLog 7834
+RMD160 a618099b525ce1c63bc12de11d45184681b6819a ChangeLog 7834
+SHA256 417606b7fd5053bd1dd83e8ee84c8fed950dc55ee25e5eb8cf90a39ef5840120 ChangeLog 7834
MD5 b0b309c7dfe2c8566424e91792350f95 fftw-2.1.5-r1.ebuild 4141
RMD160 72b227d25d9871b5d1d09cfd062d67cd636ddccf fftw-2.1.5-r1.ebuild 4141
SHA256 6d354780d0c0e6b341842fc1941266db9dd3c90d867b77813b9e1c63d7aa069e fftw-2.1.5-r1.ebuild 4141
@@ -13,9 +13,9 @@ SHA256 cce35d30515b257d3a97c06ad84391af23101a9ab142b3022ca0b0d0a103e501 fftw-3.0
MD5 1b3f7c7f367fa0164bf31ab90e61d8f5 fftw-3.0.1.ebuild 2103
RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 fftw-3.0.1.ebuild 2103
SHA256 46a5f84b3a0e8a357c0580a5c56edc610b516733e062947418fbb4515a22aef9 fftw-3.0.1.ebuild 2103
-MD5 e6aa8e2db6ce74302b379c3812eab87c fftw-3.1.ebuild 2008
-RMD160 84ad8f55f57828d2a3ec8d391509d08a4f134d47 fftw-3.1.ebuild 2008
-SHA256 1139e65e974436110fd07f26cf42c267fa9b585969cf2369c3e8898324988665 fftw-3.1.ebuild 2008
+MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151
+RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151
+SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151
MD5 1395bb17e5d04e7050eab24d5b7b25d1 files/3-tmpfile.patch 538
RMD160 e87f7b414a4cb9371c970bf140f87074f8024f25 files/3-tmpfile.patch 538
SHA256 c51956fc0ce2bb25cf84e4929ab76de27dca47efeef659d57d7513e0099f99d1 files/3-tmpfile.patch 538
diff --git a/sci-libs/fftw/fftw-3.1.ebuild b/sci-libs/fftw/fftw-3.1.ebuild
index 737da03196e5..b057244b66d7 100644
--- a/sci-libs/fftw/fftw-3.1.ebuild
+++ b/sci-libs/fftw/fftw-3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.ebuild,v 1.1 2006/02/11 20:19:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.ebuild,v 1.2 2006/03/07 22:01:43 markusle Exp $
inherit flag-o-matic eutils toolchain-funcs
@@ -40,6 +40,13 @@ src_compile() {
myconfsingle="$myconfsingle --enable-k7"
fi
+ # disable building of shared libs for k7 (c.f. bug #125218)
+ if ! use 3dnow; then
+ myconfsingle="$myconfsingle --enable-shared"
+ myconfdouble="$myconfdouble --enable-shared"
+ fi
+
+
# Altivec-support in fftw is currently broken
# with gcc 3.4
if [ "`gcc-version`" != "3.4" ]; then
@@ -48,7 +55,6 @@ src_compile() {
cd "${S}-single"
econf \
- --enable-shared \
--enable-threads \
--enable-float \
${myconfsingle} || \
@@ -58,7 +64,6 @@ src_compile() {
#the only difference here is no --enable-float
cd "${S}-double"
econf \
- --enable-shared \
--enable-threads \
${myconfdouble} || \
die "./configure in double failed"