| 1 |
commit: c555a18358d85d307fae9f4f0b13ef2d9b8376b5 |
| 2 |
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 3 |
AuthorDate: Sun Feb 1 12:28:19 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 1 12:28:19 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c555a183 |
| 7 |
|
| 8 |
sci-libs/fftw: Convert to CPU_FLAGS_X86 |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/fftw/ChangeLog | 6 +++++- |
| 12 |
sci-libs/fftw/fftw-9999.ebuild | 14 +++++++------- |
| 13 |
sci-libs/fftw/metadata.xml | 2 -- |
| 14 |
3 files changed, 12 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog |
| 17 |
index cedc57e..cae3ff9 100644 |
| 18 |
--- a/sci-libs/fftw/ChangeLog |
| 19 |
+++ b/sci-libs/fftw/ChangeLog |
| 20 |
@@ -1,7 +1,11 @@ |
| 21 |
# ChangeLog for sci-libs/fftw |
| 22 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 29 Jan 2015; Marius Brehler <marbre@××××××××××××××.de> fftw-9999.ebuild, |
| 27 |
+ metadata.xml: |
| 28 |
+ Convert to CPU_FLAGS_X86 (adopted from tree) |
| 29 |
+ |
| 30 |
04 Jul 2014; Justin Lecher <jlec@g.o> fftw-9999.ebuild: |
| 31 |
Drop reference to app-emulation/emul-linux-x86-soundlibs |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild |
| 35 |
index 1b02b62..78a157e 100644 |
| 36 |
--- a/sci-libs/fftw/fftw-9999.ebuild |
| 37 |
+++ b/sci-libs/fftw/fftw-9999.ebuild |
| 38 |
@@ -1,4 +1,4 @@ |
| 39 |
-# Copyright 1999-2014 Gentoo Foundation |
| 40 |
+# Copyright 1999-2015 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
# $Header: $ |
| 43 |
|
| 44 |
@@ -24,7 +24,7 @@ fi |
| 45 |
|
| 46 |
LICENSE="GPL-2" |
| 47 |
SLOT="3.0" |
| 48 |
-IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus" |
| 49 |
+IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus" |
| 50 |
|
| 51 |
RDEPEND="mpi? ( virtual/mpi )" |
| 52 |
DEPEND="${RDEPEND} |
| 53 |
@@ -95,7 +95,7 @@ src_configure() { |
| 54 |
fi |
| 55 |
|
| 56 |
myeconfargs=( |
| 57 |
- $(use_enable fma) |
| 58 |
+ $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma) |
| 59 |
$(use_enable fortran) |
| 60 |
$(use_enable zbus mips-zbus-timer) |
| 61 |
$(use_enable threads) |
| 62 |
@@ -106,15 +106,15 @@ src_configure() { |
| 63 |
myeconfargs+=( |
| 64 |
--enable-single |
| 65 |
$(use_enable altivec) |
| 66 |
- $(use_enable avx) |
| 67 |
- $(use_enable sse) |
| 68 |
+ $(use_enable cpu_flags_x86_avx avx) |
| 69 |
+ $(use_enable cpu_flags_x86_sse sse) |
| 70 |
${enable_mpi} |
| 71 |
$(use_enable neon) |
| 72 |
) |
| 73 |
elif [[ $x == double ]]; then |
| 74 |
myeconfargs+=( |
| 75 |
- $(use_enable avx) |
| 76 |
- $(use_enable sse2) |
| 77 |
+ $(use_enable cpu_flags_x86_avx avx) |
| 78 |
+ $(use_enable cpu_flags_x86_sse2 sse2) |
| 79 |
${enable_mpi} |
| 80 |
) |
| 81 |
elif [[ $x == longdouble ]]; then |
| 82 |
|
| 83 |
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml |
| 84 |
index 50e74c1..c6b1bd0 100644 |
| 85 |
--- a/sci-libs/fftw/metadata.xml |
| 86 |
+++ b/sci-libs/fftw/metadata.xml |
| 87 |
@@ -12,8 +12,6 @@ |
| 88 |
publicly available FFT software. |
| 89 |
</longdescription> |
| 90 |
<use> |
| 91 |
- <flag name="avx">Adds support for Advanced Vector Extensions</flag> |
| 92 |
- <flag name="fma">Use the Fused Multiply Add instruction set (fma3/fma4 either one)</flag> |
| 93 |
<flag name="quad">Build quadruple precision lib</flag> |
| 94 |
<flag name="zbus">Adds support for ZBus cycle-counter of mips</flag> |
| 95 |
</use> |
Archives