Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/petsc/
Date: Thu, 26 May 2022 01:27:06
Message-Id: 1653528414.52f8f0e9c07b4122b5dbdfeb068ed79b0b9ca2f5.tamiko@gentoo
1 commit: 52f8f0e9c07b4122b5dbdfeb068ed79b0b9ca2f5
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 26 00:52:50 2022 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 01:26:54 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f8f0e9
7
8 sci-mathematics/petsc: drop superfluous USE=cxx
9
10 Closes: https://bugs.gentoo.org/846434
11 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
12
13 sci-mathematics/petsc/petsc-3.17.1.ebuild | 12 ++++--------
14 1 file changed, 4 insertions(+), 8 deletions(-)
15
16 diff --git a/sci-mathematics/petsc/petsc-3.17.1.ebuild b/sci-mathematics/petsc/petsc-3.17.1.ebuild
17 index d75bccaa9f8f..241199f5fa1c 100644
18 --- a/sci-mathematics/petsc/petsc-3.17.1.ebuild
19 +++ b/sci-mathematics/petsc/petsc-3.17.1.ebuild
20 @@ -14,7 +14,7 @@ SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
21 LICENSE="BSD-2"
22 SLOT="0"
23 KEYWORDS="~amd64 ~x86"
24 -IUSE="afterimage boost complex-scalars cxx debug fftw
25 +IUSE="afterimage boost complex-scalars debug fftw
26 fortran hdf5 hypre int64 mpi metis mumps scotch superlu threads X"
27
28 # readd sparse when suitesparse-5.6.0 is in tree
29 @@ -30,7 +30,7 @@ RDEPEND="
30 hdf5? ( sci-libs/hdf5[mpi?] )
31 hypre? ( >=sci-libs/hypre-2.18.0[int64?,mpi?] )
32 metis? ( >=sci-libs/parmetis-4 )
33 - mpi? ( virtual/mpi[cxx?,fortran?] )
34 + mpi? ( virtual/mpi[fortran?] )
35 mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
36 scotch? ( sci-libs/scotch[int64?,mpi?] )
37 superlu? ( >=sci-libs/superlu-5 )
38 @@ -52,7 +52,7 @@ REQUIRED_USE="
39 afterimage? ( X )
40 complex-scalars? ( !hypre !superlu )
41 hdf5? ( mpi )
42 - hypre? ( cxx mpi !superlu )
43 + hypre? ( mpi !superlu )
44 mumps? ( mpi scotch )
45 scotch? ( mpi )
46 superlu? ( !hypre )
47 @@ -112,16 +112,14 @@ src_configure() {
48 # bug 810841
49 addpredict /dev/kfd
50
51 - local mylang
52 local myopt
53
54 - use cxx && mylang="cxx" || mylang="c"
55 use debug && myopt="debug" || myopt="opt"
56
57 # environmental variables expected by petsc during build
58
59 export PETSC_DIR="${S}"
60 - export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
61 + export PETSC_ARCH="linux-gnu-c-${myopt}"
62
63 if use debug; then
64 strip-flags
65 @@ -147,7 +145,6 @@ src_configure() {
66 RANLIB="${RANLIB}" \
67 --prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
68 --with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
69 - --with-clanguage="${mylang}" \
70 --with-cmake:BOOL=1 \
71 --with-gnu-compilers \
72 --with-imagemagick=0 \
73 @@ -171,7 +168,6 @@ src_configure() {
74 $(petsc_with superlu superlu /usr/include/superlu -lsuperlu) \
75 $(petsc_with scotch ptscotch /usr/include/scotch [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
76 $(petsc_with mumps scalapack /usr/include/scalapack -lscalapack) \
77 - $(use cxx && ! use complex-scalars && echo "--with-c-support=1") \
78 $(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
79 $(use int64 && echo "--with-index-size=64") \
80 $(use_with boost) \