| 1 |
commit: 3f24f036510d9848ff0a9950fc8bc7e88ab7fd1d |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 23 12:43:46 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 23 12:44:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f24f036 |
| 7 |
|
| 8 |
dev-libs/starpu: Fix more dependencies |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 11 |
|
| 12 |
dev-libs/starpu/metadata.xml | 2 ++ |
| 13 |
dev-libs/starpu/starpu-1.2.6.ebuild | 43 +++++++++++++++++++++++-------------- |
| 14 |
2 files changed, 29 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/starpu/metadata.xml b/dev-libs/starpu/metadata.xml |
| 17 |
index 8e975146000..e3bd900a60a 100644 |
| 18 |
--- a/dev-libs/starpu/metadata.xml |
| 19 |
+++ b/dev-libs/starpu/metadata.xml |
| 20 |
@@ -15,5 +15,7 @@ |
| 21 |
<flag name="cuda">Enable NVIDIA CUDA toolkit support</flag> |
| 22 |
<flag name="gcc-plugin">Enable GCC extension plugin (experimental)</flag> |
| 23 |
<flag name="opencl">Enable OpenCL support</flag> |
| 24 |
+ <flag name="spinlock-check">Enable spinlock check</flag> |
| 25 |
+ <flag name="valgrind">Enable <pkg>dev-util/valgrind</pkg> support</flag> |
| 26 |
</use> |
| 27 |
</pkgmetadata> |
| 28 |
|
| 29 |
diff --git a/dev-libs/starpu/starpu-1.2.6.ebuild b/dev-libs/starpu/starpu-1.2.6.ebuild |
| 30 |
index cb8669fa9a4..00bae6ae10a 100644 |
| 31 |
--- a/dev-libs/starpu/starpu-1.2.6.ebuild |
| 32 |
+++ b/dev-libs/starpu/starpu-1.2.6.ebuild |
| 33 |
@@ -2,10 +2,9 @@ |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI=6 |
| 37 |
- |
| 38 |
FORTRAN_STANDARD=90 |
| 39 |
- |
| 40 |
-inherit autotools toolchain-funcs cuda fortran-2 |
| 41 |
+FORTRAN_NEEDED="fortran" |
| 42 |
+inherit autotools cuda fortran-2 toolchain-funcs |
| 43 |
|
| 44 |
DESCRIPTION="Unified runtime system for heterogeneous multicore architectures" |
| 45 |
HOMEPAGE="http://starpu.gforge.inria.fr/" |
| 46 |
@@ -15,12 +14,14 @@ LICENSE="LGPL-2.1" |
| 47 |
SLOT="0/8" |
| 48 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 49 |
|
| 50 |
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl |
| 51 |
- static-libs test" |
| 52 |
+IUSE=" |
| 53 |
+ blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl |
| 54 |
+ spinlock-check static-libs test valgrind |
| 55 |
+" |
| 56 |
|
| 57 |
RDEPEND=" |
| 58 |
- sys-apps/hwloc:0= |
| 59 |
sci-mathematics/glpk:0= |
| 60 |
+ sys-apps/hwloc:0= |
| 61 |
blas? ( virtual/blas ) |
| 62 |
cuda? ( dev-util/nvidia-cuda-toolkit |
| 63 |
x11-drivers/nvidia-drivers |
| 64 |
@@ -28,19 +29,24 @@ RDEPEND=" |
| 65 |
fftw? ( sci-libs/fftw:3.0= ) |
| 66 |
mpi? ( virtual/mpi ) |
| 67 |
opencl? ( virtual/opencl ) |
| 68 |
- opengl? ( media-libs/freeglut:0= )" |
| 69 |
+ opengl? ( media-libs/freeglut:0= ) |
| 70 |
+ valgrind? ( dev-util/valgrind ) |
| 71 |
+" |
| 72 |
|
| 73 |
-DEPEND="${RDEPEND} |
| 74 |
+DEPEND=" |
| 75 |
+ ${RDEPEND} |
| 76 |
virtual/pkgconfig |
| 77 |
doc? ( app-doc/doxygen virtual/latex-base ) |
| 78 |
- test? ( gcc-plugin? ( dev-scheme/guile ) )" |
| 79 |
+ test? ( gcc-plugin? ( dev-scheme/guile ) ) |
| 80 |
+" |
| 81 |
|
| 82 |
src_prepare() { |
| 83 |
default |
| 84 |
- # upstream did not want the patches so apply sed's |
| 85 |
- sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die |
| 86 |
+ |
| 87 |
sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die |
| 88 |
+ sed -i -e 's:-O3::g;s:-D_FORTIFY_SOURCE=1::g' configure.ac || die |
| 89 |
eautoreconf |
| 90 |
+ |
| 91 |
use cuda && cuda_src_prepare |
| 92 |
} |
| 93 |
|
| 94 |
@@ -48,19 +54,24 @@ src_configure() { |
| 95 |
use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)" |
| 96 |
|
| 97 |
econf \ |
| 98 |
- --disable-build-examples \ |
| 99 |
- --disable-starpu-top \ |
| 100 |
+ $(use cuda && use_enable blas magma) \ |
| 101 |
+ $(use mpi && use_enable test mpi-check) \ |
| 102 |
$(use_enable cuda) \ |
| 103 |
- $(use_enable debug) \ |
| 104 |
$(use_enable doc build-doc) \ |
| 105 |
$(use_enable fftw starpufft) \ |
| 106 |
+ $(use_enable fortran) \ |
| 107 |
$(use_enable gcc-plugin gcc-extensions) \ |
| 108 |
$(use_enable opencl) \ |
| 109 |
$(use_enable opengl opengl-render) \ |
| 110 |
+ $(use_enable spinlock-check) \ |
| 111 |
$(use_enable static-libs static) \ |
| 112 |
+ $(use_enable valgrind) \ |
| 113 |
$(use_with mpi mpicc "$(type -P mpicc)") \ |
| 114 |
- $(use cuda && use_enable blas magma) \ |
| 115 |
- $(use mpi && use_enable test mpi-check) |
| 116 |
+ --disable-build-examples \ |
| 117 |
+ --disable-debug \ |
| 118 |
+ --disable-fstack-protector-all \ |
| 119 |
+ --disable-full-gdb-information \ |
| 120 |
+ --disable-starpu-top |
| 121 |
} |
| 122 |
|
| 123 |
src_test() { |
Archives