1 |
commit: a7f522cb19676c477b48a0c6a51dce9e9f45a3ed |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 24 18:27:26 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 24 18:27:39 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f522cb |
7 |
|
8 |
dev-cpp/eigen: Forward porting ebuild changes, Backwards the patches |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=575512 |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
14 |
|
15 |
dev-cpp/eigen/eigen-3.2.8-r1.ebuild | 71 +++++++++++++++++++--- |
16 |
...ort.patch => eigen-3.2.7-adaolc-backport.patch} | 0 |
17 |
...patch => eigen-3.2.7-pastix-5.2-backport.patch} | 0 |
18 |
3 files changed, 63 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/dev-cpp/eigen/eigen-3.2.8-r1.ebuild b/dev-cpp/eigen/eigen-3.2.8-r1.ebuild |
21 |
index 447ca29..d79230b 100644 |
22 |
--- a/dev-cpp/eigen/eigen-3.2.8-r1.ebuild |
23 |
+++ b/dev-cpp/eigen/eigen-3.2.8-r1.ebuild |
24 |
@@ -2,9 +2,11 @@ |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
# $Id$ |
27 |
|
28 |
-EAPI=5 |
29 |
+EAPI=6 |
30 |
|
31 |
-inherit cmake-utils |
32 |
+FORTRAN_NEEDED="test" |
33 |
+ |
34 |
+inherit cmake-utils fortran-2 |
35 |
|
36 |
DESCRIPTION="C++ template library for linear algebra" |
37 |
HOMEPAGE="http://eigen.tuxfamily.org/" |
38 |
@@ -13,10 +15,43 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2" |
39 |
LICENSE="LGPL-2 GPL-3" |
40 |
SLOT="3" |
41 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
42 |
-IUSE="debug doc" |
43 |
+IUSE="altivec debug doc openmp test" |
44 |
+IUSE+=" cpu_flags_x86_sse2" |
45 |
+IUSE+=" cpu_flags_x86_sse3" |
46 |
+IUSE+=" cpu_flags_x86_sse4_1" |
47 |
+IUSE+=" cpu_flags_x86_sse4_2" |
48 |
+IUSE+=" cpu_flags_x86_ssse3" |
49 |
+#IUSE+=" cpu_flags_x86_x87" |
50 |
|
51 |
-DEPEND="doc? ( app-doc/doxygen[dot,latex] )" |
52 |
RDEPEND="!dev-cpp/eigen:0" |
53 |
+DEPEND=" |
54 |
+ doc? ( app-doc/doxygen[dot,latex] ) |
55 |
+ test? ( |
56 |
+ dev-libs/gmp:0 |
57 |
+ dev-libs/mpfr:0 |
58 |
+ media-libs/freeglut |
59 |
+ media-libs/glew |
60 |
+ sci-libs/adolc |
61 |
+ sci-libs/cholmod |
62 |
+ sci-libs/fftw:3.0 |
63 |
+ sci-libs/pastix |
64 |
+ sci-libs/umfpack |
65 |
+ sci-libs/scotch |
66 |
+ sci-libs/spqr |
67 |
+ sci-libs/superlu |
68 |
+ dev-qt/qtcore:4 |
69 |
+ virtual/opengl |
70 |
+ virtual/pkgconfig |
71 |
+ ) |
72 |
+ " |
73 |
+# Missing: |
74 |
+# METIS-5 |
75 |
+# GOOGLEHASH |
76 |
+ |
77 |
+PATCHES=( |
78 |
+ "${FILESDIR}"/${PN}-3.2.7-pastix-5.2-backport.patch |
79 |
+ "${FILESDIR}"/${PN}-3.2.7-adaolc-backport.patch |
80 |
+) |
81 |
|
82 |
src_unpack() { |
83 |
default |
84 |
@@ -24,14 +59,27 @@ src_unpack() { |
85 |
} |
86 |
|
87 |
src_prepare() { |
88 |
+ sed \ |
89 |
+ -e 's:-g2::g' \ |
90 |
+ -i cmake/EigenConfigureTesting.cmake || die |
91 |
+ |
92 |
sed -i CMakeLists.txt \ |
93 |
-e "/add_subdirectory(demos/d" \ |
94 |
- -e "/add_subdirectory(blas/d" \ |
95 |
- -e "/add_subdirectory(lapack/d" \ |
96 |
|| die "sed disable unused bundles failed" |
97 |
|
98 |
+ if ! use test; then |
99 |
+ sed -i CMakeLists.txt \ |
100 |
+ -e "/add_subdirectory(blas/d" \ |
101 |
+ -e "/add_subdirectory(lapack/d" \ |
102 |
+ || die "sed disable unused bundles failed" |
103 |
+ fi |
104 |
+ |
105 |
sed -i -e "/Unknown build type/d" CMakeLists.txt || die |
106 |
|
107 |
+ sed \ |
108 |
+ -e '/Cflags/s|:.*|: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}|g' \ |
109 |
+ -i eigen3.pc.in || die |
110 |
+ |
111 |
cmake-utils_src_prepare |
112 |
} |
113 |
|
114 |
@@ -43,10 +91,17 @@ src_compile() { |
115 |
src_test() { |
116 |
local mycmakeargs=( |
117 |
-DEIGEN_BUILD_TESTS=ON |
118 |
- -DEIGEN_TEST_NO_FORTRAN=ON |
119 |
- -DEIGEN_TEST_NO_OPENGL=ON |
120 |
+ -DEIGEN_TEST_ALTIVEC="$(usex altivec)" |
121 |
+ -DEIGEN_TEST_OPENMP="$(usex openmp)" |
122 |
+ -DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)" |
123 |
+ -DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)" |
124 |
+ -DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)" |
125 |
+ -DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)" |
126 |
+ -DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)" |
127 |
+# -DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)" |
128 |
) |
129 |
cmake-utils_src_configure |
130 |
+ cmake-utils_src_compile blas |
131 |
cmake-utils_src_compile buildtests |
132 |
cmake-utils_src_test |
133 |
} |
134 |
|
135 |
diff --git a/dev-cpp/eigen/files/eigen-3.2.8-adaolc-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch |
136 |
similarity index 100% |
137 |
rename from dev-cpp/eigen/files/eigen-3.2.8-adaolc-backport.patch |
138 |
rename to dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch |
139 |
|
140 |
diff --git a/dev-cpp/eigen/files/eigen-3.2.8-pastix-5.2-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch |
141 |
similarity index 100% |
142 |
rename from dev-cpp/eigen/files/eigen-3.2.8-pastix-5.2-backport.patch |
143 |
rename to dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch |