| 1 |
commit: c932565c4719295cadac1afc488d304363e12342 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 29 22:28:28 2015 +0000 |
| 4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 29 22:28:28 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c932565c |
| 7 |
|
| 8 |
Convert to CPU_FLAGS_X86 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.15 |
| 11 |
|
| 12 |
--- |
| 13 |
sci-libs/dealii/ChangeLog | 4 ++++ |
| 14 |
sci-libs/dealii/dealii-8.1.0-r2.ebuild | 12 ++++++------ |
| 15 |
sci-libs/dealii/dealii-8.2.1.ebuild | 12 +++++++----- |
| 16 |
sci-libs/dealii/dealii-9999.ebuild | 12 +++++++----- |
| 17 |
sci-libs/dealii/metadata.xml | 1 - |
| 18 |
5 files changed, 24 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog |
| 21 |
index 7a8398c..1b5b46a 100644 |
| 22 |
--- a/sci-libs/dealii/ChangeLog |
| 23 |
+++ b/sci-libs/dealii/ChangeLog |
| 24 |
@@ -2,6 +2,10 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
# $Header: $ |
| 27 |
|
| 28 |
+ 29 Jan 2015; Matthias Maier <tamiko@g.o> dealii-8.1.0-r2.ebuild, |
| 29 |
+ dealii-8.2.1.ebuild, dealii-9999.ebuild, metadata.xml: |
| 30 |
+ Convert to CPU_FLAGS_X86 |
| 31 |
+ |
| 32 |
21 Jan 2015; Matthias Maier <tamiko@g.o> dealii-9999.ebuild: |
| 33 |
sci-libs/dealii - fix typo in live ebuild |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/sci-libs/dealii/dealii-8.1.0-r2.ebuild b/sci-libs/dealii/dealii-8.1.0-r2.ebuild |
| 37 |
index faf32b7..7e174ff 100644 |
| 38 |
--- a/sci-libs/dealii/dealii-8.1.0-r2.ebuild |
| 39 |
+++ b/sci-libs/dealii/dealii-8.1.0-r2.ebuild |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-# Copyright 1999-2014 Gentoo Foundation |
| 42 |
+# Copyright 1999-2015 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
# $Header: $ |
| 45 |
|
| 46 |
@@ -24,9 +24,9 @@ fi |
| 47 |
LICENSE="LGPL-2.1+" |
| 48 |
SLOT="0" |
| 49 |
IUSE=" |
| 50 |
- arpack avx +debug doc +examples hdf5 +lapack mesh_converter metis mpi |
| 51 |
- mumps netcdf p4est parameter_gui petsc +sparse |
| 52 |
- sse2 static-libs +tbb trilinos |
| 53 |
+ arpack cpu_flags_x86_avx cpu_flags_x86_sse2 +debug doc +examples hdf5 |
| 54 |
+ +lapack mesh_converter metis mpi mumps netcdf p4est parameter_gui petsc |
| 55 |
+ +sparse static-libs +tbb trilinos |
| 56 |
" |
| 57 |
|
| 58 |
# TODO: add slepc use flag once slepc is packaged for gentoo-science |
| 59 |
@@ -74,7 +74,8 @@ src_configure() { |
| 60 |
-DDEAL_II_WITH_BZIP2=ON |
| 61 |
-DDEAL_II_WITH_ZLIB=ON |
| 62 |
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK) |
| 63 |
- $(cmake-utils_use avx DEAL_II_HAVE_AVX) |
| 64 |
+ $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX) |
| 65 |
+ $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2) |
| 66 |
$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION) |
| 67 |
$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES) |
| 68 |
$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5) |
| 69 |
@@ -88,7 +89,6 @@ src_configure() { |
| 70 |
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI) |
| 71 |
$(cmake-utils_use petsc DEAL_II_WITH_PETSC) |
| 72 |
$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK) |
| 73 |
- $(cmake-utils_use sse2 DEAL_II_HAVE_SSE2) |
| 74 |
$(cmake-utils_use !static-libs BUILD_SHARED_LIBS) |
| 75 |
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS) |
| 76 |
$(cmake-utils_use tbb DEAL_II_WITH_THREADS) |
| 77 |
|
| 78 |
diff --git a/sci-libs/dealii/dealii-8.2.1.ebuild b/sci-libs/dealii/dealii-8.2.1.ebuild |
| 79 |
index 2aff619..07c31a3 100644 |
| 80 |
--- a/sci-libs/dealii/dealii-8.2.1.ebuild |
| 81 |
+++ b/sci-libs/dealii/dealii-8.2.1.ebuild |
| 82 |
@@ -31,9 +31,10 @@ fi |
| 83 |
LICENSE="LGPL-2.1+" |
| 84 |
SLOT="0" |
| 85 |
IUSE=" |
| 86 |
- arpack avx c++11 +debug doc +examples hdf5 +lapack mesh_converter metis |
| 87 |
- mpi mumps muparser opencascade netcdf p4est parameter_gui petsc +sparse |
| 88 |
- sse2 static-libs +tbb trilinos |
| 89 |
+ arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11 |
| 90 |
+ +debug doc +examples hdf5 +lapack mesh_converter metis mpi mumps |
| 91 |
+ muparser opencascade netcdf p4est parameter_gui petsc +sparse |
| 92 |
+ static-libs +tbb trilinos |
| 93 |
" |
| 94 |
|
| 95 |
# TODO: add slepc use flag once slepc is packaged for gentoo-science |
| 96 |
@@ -83,8 +84,10 @@ src_configure() { |
| 97 |
-DDEAL_II_WITH_BZIP2=ON |
| 98 |
-DDEAL_II_WITH_ZLIB=ON |
| 99 |
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK) |
| 100 |
- $(cmake-utils_use avx DEAL_II_HAVE_AVX) |
| 101 |
$(cmake-utils_use c++11 DEAL_II_WITH_CXX11) |
| 102 |
+ $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX) |
| 103 |
+ $(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512) |
| 104 |
+ $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2) |
| 105 |
$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION) |
| 106 |
$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES) |
| 107 |
$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5) |
| 108 |
@@ -101,7 +104,6 @@ src_configure() { |
| 109 |
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI) |
| 110 |
$(cmake-utils_use petsc DEAL_II_WITH_PETSC) |
| 111 |
$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK) |
| 112 |
- $(cmake-utils_use sse2 DEAL_II_HAVE_SSE2) |
| 113 |
$(cmake-utils_use !static-libs BUILD_SHARED_LIBS) |
| 114 |
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS) |
| 115 |
$(cmake-utils_use tbb DEAL_II_WITH_THREADS) |
| 116 |
|
| 117 |
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild |
| 118 |
index 01a7a1c..2774e75 100644 |
| 119 |
--- a/sci-libs/dealii/dealii-9999.ebuild |
| 120 |
+++ b/sci-libs/dealii/dealii-9999.ebuild |
| 121 |
@@ -31,9 +31,10 @@ fi |
| 122 |
LICENSE="LGPL-2.1+" |
| 123 |
SLOT="0" |
| 124 |
IUSE=" |
| 125 |
- arpack avx c++11 +debug doc +examples hdf5 +lapack mesh_converter metis |
| 126 |
- mpi muparser opencascade netcdf p4est parameter_gui petsc +sparse |
| 127 |
- sse2 static-libs +tbb trilinos |
| 128 |
+ arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11 |
| 129 |
+ +debug doc +examples hdf5 +lapack mesh_converter metis mpi muparser |
| 130 |
+ opencascade netcdf p4est parameter_gui petsc +sparse static-libs +tbb |
| 131 |
+ trilinos |
| 132 |
" |
| 133 |
|
| 134 |
# TODO: add slepc use flag once slepc is packaged for gentoo-science |
| 135 |
@@ -79,8 +80,10 @@ src_configure() { |
| 136 |
-DDEAL_II_WITH_BZIP2=ON |
| 137 |
-DDEAL_II_WITH_ZLIB=ON |
| 138 |
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK) |
| 139 |
- $(cmake-utils_use avx DEAL_II_HAVE_AVX) |
| 140 |
$(cmake-utils_use c++11 DEAL_II_WITH_CXX11) |
| 141 |
+ $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX) |
| 142 |
+ $(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512) |
| 143 |
+ $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2) |
| 144 |
$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION) |
| 145 |
$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES) |
| 146 |
$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5) |
| 147 |
@@ -96,7 +99,6 @@ src_configure() { |
| 148 |
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI) |
| 149 |
$(cmake-utils_use petsc DEAL_II_WITH_PETSC) |
| 150 |
$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK) |
| 151 |
- $(cmake-utils_use sse2 DEAL_II_HAVE_SSE2) |
| 152 |
$(cmake-utils_use !static-libs BUILD_SHARED_LIBS) |
| 153 |
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS) |
| 154 |
$(cmake-utils_use tbb DEAL_II_WITH_THREADS) |
| 155 |
|
| 156 |
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml |
| 157 |
index ac7226b..e838dc1 100644 |
| 158 |
--- a/sci-libs/dealii/metadata.xml |
| 159 |
+++ b/sci-libs/dealii/metadata.xml |
| 160 |
@@ -14,7 +14,6 @@ to the complex data structures and algorithms required. |
| 161 |
</longdescription> |
| 162 |
<use> |
| 163 |
<flag name="arpack">Adds support for ARPACK (<pkg>sci-libs/arpack</pkg>)</flag> |
| 164 |
- <flag name="avx">Use Advanced Vector Extensions for AVX capable chips</flag> |
| 165 |
<flag name="debug"> |
| 166 |
Build an additional debug library with extra debug codepaths, like asserts |
| 167 |
and extra output. If you want to get meaningful backtraces see |
Archives