From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A66BF138334 for ; Sun, 23 Sep 2018 12:44:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A527E0801; Sun, 23 Sep 2018 12:44:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 396A1E0801 for ; Sun, 23 Sep 2018 12:44:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAAAC335CD8 for ; Sun, 23 Sep 2018 12:44:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE11B3C6 for ; Sun, 23 Sep 2018 12:44:06 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1537706643.3f24f036510d9848ff0a9950fc8bc7e88ab7fd1d.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/starpu/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/starpu/metadata.xml dev-libs/starpu/starpu-1.2.6.ebuild X-VCS-Directories: dev-libs/starpu/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 3f24f036510d9848ff0a9950fc8bc7e88ab7fd1d X-VCS-Branch: master Date: Sun, 23 Sep 2018 12:44:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 486d4904-f2bf-4320-a75c-07de0a5ebacc X-Archives-Hash: 5dfaed5acec8a496a7eaf2b62dca305e commit: 3f24f036510d9848ff0a9950fc8bc7e88ab7fd1d Author: Jeroen Roovers gentoo org> AuthorDate: Sun Sep 23 12:43:46 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Sep 23 12:44:03 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f24f036 dev-libs/starpu: Fix more dependencies Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-libs/starpu/metadata.xml | 2 ++ dev-libs/starpu/starpu-1.2.6.ebuild | 43 +++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dev-libs/starpu/metadata.xml b/dev-libs/starpu/metadata.xml index 8e975146000..e3bd900a60a 100644 --- a/dev-libs/starpu/metadata.xml +++ b/dev-libs/starpu/metadata.xml @@ -15,5 +15,7 @@ Enable NVIDIA CUDA toolkit support Enable GCC extension plugin (experimental) Enable OpenCL support + Enable spinlock check + Enable dev-util/valgrind support diff --git a/dev-libs/starpu/starpu-1.2.6.ebuild b/dev-libs/starpu/starpu-1.2.6.ebuild index cb8669fa9a4..00bae6ae10a 100644 --- a/dev-libs/starpu/starpu-1.2.6.ebuild +++ b/dev-libs/starpu/starpu-1.2.6.ebuild @@ -2,10 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 - FORTRAN_STANDARD=90 - -inherit autotools toolchain-funcs cuda fortran-2 +FORTRAN_NEEDED="fortran" +inherit autotools cuda fortran-2 toolchain-funcs DESCRIPTION="Unified runtime system for heterogeneous multicore architectures" HOMEPAGE="http://starpu.gforge.inria.fr/" @@ -15,12 +14,14 @@ LICENSE="LGPL-2.1" SLOT="0/8" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl - static-libs test" +IUSE=" + blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl + spinlock-check static-libs test valgrind +" RDEPEND=" - sys-apps/hwloc:0= sci-mathematics/glpk:0= + sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers @@ -28,19 +29,24 @@ RDEPEND=" fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) - opengl? ( media-libs/freeglut:0= )" + opengl? ( media-libs/freeglut:0= ) + valgrind? ( dev-util/valgrind ) +" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) - test? ( gcc-plugin? ( dev-scheme/guile ) )" + test? ( gcc-plugin? ( dev-scheme/guile ) ) +" src_prepare() { default - # upstream did not want the patches so apply sed's - sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die + sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die + sed -i -e 's:-O3::g;s:-D_FORTIFY_SOURCE=1::g' configure.ac || die eautoreconf + use cuda && cuda_src_prepare } @@ -48,19 +54,24 @@ src_configure() { use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)" econf \ - --disable-build-examples \ - --disable-starpu-top \ + $(use cuda && use_enable blas magma) \ + $(use mpi && use_enable test mpi-check) \ $(use_enable cuda) \ - $(use_enable debug) \ $(use_enable doc build-doc) \ $(use_enable fftw starpufft) \ + $(use_enable fortran) \ $(use_enable gcc-plugin gcc-extensions) \ $(use_enable opencl) \ $(use_enable opengl opengl-render) \ + $(use_enable spinlock-check) \ $(use_enable static-libs static) \ + $(use_enable valgrind) \ $(use_with mpi mpicc "$(type -P mpicc)") \ - $(use cuda && use_enable blas magma) \ - $(use mpi && use_enable test mpi-check) + --disable-build-examples \ + --disable-debug \ + --disable-fstack-protector-all \ + --disable-full-gdb-information \ + --disable-starpu-top } src_test() {