commit: c932565c4719295cadac1afc488d304363e12342
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 29 22:28:28 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 22:28:28 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c932565c
Convert to CPU_FLAGS_X86
Package-Manager: portage-2.2.15
---
sci-libs/dealii/ChangeLog | 4 ++++
sci-libs/dealii/dealii-8.1.0-r2.ebuild | 12 ++++++------
sci-libs/dealii/dealii-8.2.1.ebuild | 12 +++++++-----
sci-libs/dealii/dealii-9999.ebuild | 12 +++++++-----
sci-libs/dealii/metadata.xml | 1 -
5 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog
index 7a8398c..1b5b46a 100644
--- a/sci-libs/dealii/ChangeLog
+++ b/sci-libs/dealii/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Jan 2015; Matthias Maier <tam...@gentoo.org> dealii-8.1.0-r2.ebuild,
+ dealii-8.2.1.ebuild, dealii-9999.ebuild, metadata.xml:
+ Convert to CPU_FLAGS_X86
+
21 Jan 2015; Matthias Maier <tam...@gentoo.org> dealii-9999.ebuild:
sci-libs/dealii - fix typo in live ebuild
diff --git a/sci-libs/dealii/dealii-8.1.0-r2.ebuild
b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
index faf32b7..7e174ff 100644
--- a/sci-libs/dealii/dealii-8.1.0-r2.ebuild
+++ b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -24,9 +24,9 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="
- arpack avx +debug doc +examples hdf5 +lapack mesh_converter metis mpi
- mumps netcdf p4est parameter_gui petsc +sparse
- sse2 static-libs +tbb trilinos
+ arpack cpu_flags_x86_avx cpu_flags_x86_sse2 +debug doc +examples hdf5
+ +lapack mesh_converter metis mpi mumps netcdf p4est parameter_gui petsc
+ +sparse static-libs +tbb trilinos
"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -74,7 +74,8 @@ src_configure() {
-DDEAL_II_WITH_BZIP2=ON
-DDEAL_II_WITH_ZLIB=ON
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
- $(cmake-utils_use avx DEAL_II_HAVE_AVX)
+ $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
+ $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5)
@@ -88,7 +89,6 @@ src_configure() {
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
$(cmake-utils_use petsc DEAL_II_WITH_PETSC)
$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK)
- $(cmake-utils_use sse2 DEAL_II_HAVE_SSE2)
$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
$(cmake-utils_use tbb DEAL_II_WITH_THREADS)
diff --git a/sci-libs/dealii/dealii-8.2.1.ebuild
b/sci-libs/dealii/dealii-8.2.1.ebuild
index 2aff619..07c31a3 100644
--- a/sci-libs/dealii/dealii-8.2.1.ebuild
+++ b/sci-libs/dealii/dealii-8.2.1.ebuild
@@ -31,9 +31,10 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="
- arpack avx c++11 +debug doc +examples hdf5 +lapack mesh_converter metis
- mpi mumps muparser opencascade netcdf p4est parameter_gui petsc +sparse
- sse2 static-libs +tbb trilinos
+ arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11
+ +debug doc +examples hdf5 +lapack mesh_converter metis mpi mumps
+ muparser opencascade netcdf p4est parameter_gui petsc +sparse
+ static-libs +tbb trilinos
"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -83,8 +84,10 @@ src_configure() {
-DDEAL_II_WITH_BZIP2=ON
-DDEAL_II_WITH_ZLIB=ON
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
- $(cmake-utils_use avx DEAL_II_HAVE_AVX)
$(cmake-utils_use c++11 DEAL_II_WITH_CXX11)
+ $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
+ $(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512)
+ $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5)
@@ -101,7 +104,6 @@ src_configure() {
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
$(cmake-utils_use petsc DEAL_II_WITH_PETSC)
$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK)
- $(cmake-utils_use sse2 DEAL_II_HAVE_SSE2)
$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
$(cmake-utils_use tbb DEAL_II_WITH_THREADS)
diff --git a/sci-libs/dealii/dealii-9999.ebuild
b/sci-libs/dealii/dealii-9999.ebuild
index 01a7a1c..2774e75 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -31,9 +31,10 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="
- arpack avx c++11 +debug doc +examples hdf5 +lapack mesh_converter metis
- mpi muparser opencascade netcdf p4est parameter_gui petsc +sparse
- sse2 static-libs +tbb trilinos
+ arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11
+ +debug doc +examples hdf5 +lapack mesh_converter metis mpi muparser
+ opencascade netcdf p4est parameter_gui petsc +sparse static-libs +tbb
+ trilinos
"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -79,8 +80,10 @@ src_configure() {
-DDEAL_II_WITH_BZIP2=ON
-DDEAL_II_WITH_ZLIB=ON
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
- $(cmake-utils_use avx DEAL_II_HAVE_AVX)
$(cmake-utils_use c++11 DEAL_II_WITH_CXX11)
+ $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
+ $(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512)
+ $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5)
@@ -96,7 +99,6 @@ src_configure() {
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
$(cmake-utils_use petsc DEAL_II_WITH_PETSC)
$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK)
- $(cmake-utils_use sse2 DEAL_II_HAVE_SSE2)
$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
$(cmake-utils_use tbb DEAL_II_WITH_THREADS)
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index ac7226b..e838dc1 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -14,7 +14,6 @@ to the complex data structures and algorithms required.
</longdescription>
<use>
<flag name="arpack">Adds support for ARPACK
(<pkg>sci-libs/arpack</pkg>)</flag>
- <flag name="avx">Use Advanced Vector Extensions for AVX capable
chips</flag>
<flag name="debug">
Build an additional debug library with extra debug codepaths, like asserts
and extra output. If you want to get meaningful backtraces see
