| 1 |
bicatali 08/11/27 10:39:28 |
| 2 |
|
| 3 |
Modified: ChangeLog fftw-3.2.ebuild |
| 4 |
Log: |
| 5 |
Fixed for older libtool versions and forcing posix threads in the ebuild if gcc<4.2, closing bug #248687 |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.75 sci-libs/fftw/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.75&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.75&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.74&r2=1.75 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v |
| 18 |
retrieving revision 1.74 |
| 19 |
retrieving revision 1.75 |
| 20 |
diff -u -r1.74 -r1.75 |
| 21 |
--- ChangeLog 24 Nov 2008 11:02:05 -0000 1.74 |
| 22 |
+++ ChangeLog 27 Nov 2008 10:39:28 -0000 1.75 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sci-libs/fftw |
| 25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.74 2008/11/24 11:02:05 bicatali Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.75 2008/11/27 10:39:28 bicatali Exp $ |
| 28 |
+ |
| 29 |
+ 27 Nov 2008; Sébastien Fabbro <bicatali@g.o> fftw-3.2.ebuild: |
| 30 |
+ Fixed for older libtool versions and forcing posix threads in the ebuild |
| 31 |
+ if gcc<4.2, closing bug #248687 |
| 32 |
|
| 33 |
*fftw-3.2 (21 Nov 2008) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 sci-libs/fftw/fftw-3.2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: fftw-3.2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- fftw-3.2.ebuild 24 Nov 2008 11:02:05 -0000 1.1 |
| 51 |
+++ fftw-3.2.ebuild 27 Nov 2008 10:39:28 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v 1.1 2008/11/24 11:02:05 bicatali Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v 1.2 2008/11/27 10:39:28 bicatali Exp $ |
| 57 |
|
| 58 |
inherit flag-o-matic eutils toolchain-funcs autotools fortran |
| 59 |
|
| 60 |
@@ -14,6 +14,12 @@ |
| 61 |
IUSE="altivec doc fortran openmp sse sse2 threads" |
| 62 |
|
| 63 |
pkg_setup() { |
| 64 |
+ FFTW_THREADS="--disable-threads --disable-openmp" |
| 65 |
+ if use openmp; then |
| 66 |
+ FFTW_THREADS="--disable-threads --enable-openmp" |
| 67 |
+ elif use threads; then |
| 68 |
+ FFTW_THREADS="--enable-threads --disable-openmp" |
| 69 |
+ fi |
| 70 |
if use openmp && |
| 71 |
[[ $(tc-getCC)$ == *gcc* ]] && |
| 72 |
( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || |
| 73 |
@@ -22,8 +28,9 @@ |
| 74 |
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " |
| 75 |
ewarn "If you want to build fftw with OpenMP, abort now," |
| 76 |
ewarn "and switch CC to an OpenMP capable compiler" |
| 77 |
- ewarn "Otherwise the configure script will select POSIX threads." |
| 78 |
+ ewarn "Otherwise, we will build using POSIX threads." |
| 79 |
epause 5 |
| 80 |
+ FFTW_THREADS="--enable-threads --disable-openmp" |
| 81 |
fi |
| 82 |
FORTRAN="gfortran ifc g77" |
| 83 |
use fortran && fortran_pkg_setup |
| 84 |
@@ -39,6 +46,9 @@ |
| 85 |
# fix info file |
| 86 |
sed -e 's/Texinfo documentation system/Libraries/' \ |
| 87 |
-i doc/fftw3.info || die "failed to fix info file" |
| 88 |
+ |
| 89 |
+ rm m4/lt* m4/libtool.m4 |
| 90 |
+ |
| 91 |
AT_M4DIR=m4 eautoreconf |
| 92 |
cd "${WORKDIR}" |
| 93 |
mv ${P} ${P}-single |
| 94 |
@@ -52,22 +62,9 @@ |
| 95 |
|
| 96 |
local myconfcommon=" |
| 97 |
--enable-shared |
| 98 |
- $(use_enable threads) |
| 99 |
- $(use_enable fortran)" |
| 100 |
+ $(use_enable fortran) |
| 101 |
+ ${FFTW_THREADS}" |
| 102 |
|
| 103 |
- if use openmp; then |
| 104 |
- myconfcommon="${myconfcommon} |
| 105 |
- --disable-threads |
| 106 |
- --enable-openmp" |
| 107 |
- elif use threads; then |
| 108 |
- myconfcommon="${myconfcommon} |
| 109 |
- --enable-threads |
| 110 |
- --disable-openmp" |
| 111 |
- else |
| 112 |
- myconfcommon="${myconfcommon} |
| 113 |
- --disable-threads |
| 114 |
- --disable-openmp" |
| 115 |
- fi |
| 116 |
local myconfsingle="" |
| 117 |
local myconfdouble="" |
| 118 |
local myconflongdouble="" |
Archives