* [gentoo-commits] gentoo-x86 commit in sci-libs/fftw: ChangeLog fftw-3.2.ebuild
@ 2008-11-27 10:39 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2008-11-27 10:39 UTC (permalink / raw
To: gentoo-commits
bicatali 08/11/27 10:39:28
Modified: ChangeLog fftw-3.2.ebuild
Log:
Fixed for older libtool versions and forcing posix threads in the ebuild if gcc<4.2, closing bug #248687
(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Revision Changes Path
1.75 sci-libs/fftw/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.74&r2=1.75
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog 24 Nov 2008 11:02:05 -0000 1.74
+++ ChangeLog 27 Nov 2008 10:39:28 -0000 1.75
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/fftw
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.74 2008/11/24 11:02:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.75 2008/11/27 10:39:28 bicatali Exp $
+
+ 27 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> fftw-3.2.ebuild:
+ Fixed for older libtool versions and forcing posix threads in the ebuild
+ if gcc<4.2, closing bug #248687
*fftw-3.2 (21 Nov 2008)
1.2 sci-libs/fftw/fftw-3.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild?r1=1.1&r2=1.2
Index: fftw-3.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fftw-3.2.ebuild 24 Nov 2008 11:02:05 -0000 1.1
+++ fftw-3.2.ebuild 27 Nov 2008 10:39:28 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v 1.1 2008/11/24 11:02:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v 1.2 2008/11/27 10:39:28 bicatali Exp $
inherit flag-o-matic eutils toolchain-funcs autotools fortran
@@ -14,6 +14,12 @@
IUSE="altivec doc fortran openmp sse sse2 threads"
pkg_setup() {
+ FFTW_THREADS="--disable-threads --disable-openmp"
+ if use openmp; then
+ FFTW_THREADS="--disable-threads --enable-openmp"
+ elif use threads; then
+ FFTW_THREADS="--enable-threads --disable-openmp"
+ fi
if use openmp &&
[[ $(tc-getCC)$ == *gcc* ]] &&
( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
@@ -22,8 +28,9 @@
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
ewarn "If you want to build fftw with OpenMP, abort now,"
ewarn "and switch CC to an OpenMP capable compiler"
- ewarn "Otherwise the configure script will select POSIX threads."
+ ewarn "Otherwise, we will build using POSIX threads."
epause 5
+ FFTW_THREADS="--enable-threads --disable-openmp"
fi
FORTRAN="gfortran ifc g77"
use fortran && fortran_pkg_setup
@@ -39,6 +46,9 @@
# fix info file
sed -e 's/Texinfo documentation system/Libraries/' \
-i doc/fftw3.info || die "failed to fix info file"
+
+ rm m4/lt* m4/libtool.m4
+
AT_M4DIR=m4 eautoreconf
cd "${WORKDIR}"
mv ${P} ${P}-single
@@ -52,22 +62,9 @@
local myconfcommon="
--enable-shared
- $(use_enable threads)
- $(use_enable fortran)"
+ $(use_enable fortran)
+ ${FFTW_THREADS}"
- if use openmp; then
- myconfcommon="${myconfcommon}
- --disable-threads
- --enable-openmp"
- elif use threads; then
- myconfcommon="${myconfcommon}
- --enable-threads
- --disable-openmp"
- else
- myconfcommon="${myconfcommon}
- --disable-threads
- --disable-openmp"
- fi
local myconfsingle=""
local myconfdouble=""
local myconflongdouble=""
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-27 10:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-27 10:39 [gentoo-commits] gentoo-x86 commit in sci-libs/fftw: ChangeLog fftw-3.2.ebuild Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox