Skip to content

Commit ea16fc8

Browse files
committed
Gyoto: unbreak build with libstdc++
1 parent fa93f48 commit ea16fc8

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

science/Gyoto/Portfile

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ depends_lib port:cfitsio \
3535
port:udunits2 \
3636
port:xercesc3
3737

38+
# xercesc3 requires C++11; notice that eigen3-devel needs C++14.
39+
compiler.cxx_standard 2011
40+
3841
configure.args --without-yorick \
3942
--with-lorene=${prefix}/lib/lorene \
4043
--with-xerces \
@@ -132,11 +135,9 @@ subport Gyoto {
132135
}
133136
}
134137

135-
if {[string match libc++ ${configure.cxx_stdlib}]} {
136-
137-
compilers.enforce_c [boost::depends_portname]
138+
compilers.enforce_c [boost::depends_portname]
138139

139-
variant openmpi conflicts mpich \
140+
variant openmpi conflicts mpich \
140141
description {Add MPI parallelization using OpenMPI} {
141142
set c_variant [c_variant_name]
142143
if {${c_variant} == ""} {
@@ -157,12 +158,12 @@ if {[string match libc++ ${configure.cxx_stdlib}]} {
157158
build.args-delete CC="${configure.cc}"
158159
build.args-append CC="mpicc-openmpi-${mpi_suffix}"
159160
notes "
160-
For multi-processing, wrap gyoto in mpirun-openmpi-${mpi_suffix}, e.g.:
161-
$ mpirun-openmpi-${mpi_suffix} gyoto -P4 in.xml out.fits
162-
"
163-
}
161+
For multi-processing, wrap gyoto in mpirun-openmpi-${mpi_suffix}, e.g.:
162+
$ mpirun-openmpi-${mpi_suffix} gyoto -P4 in.xml out.fits
163+
"
164+
}
164165

165-
variant mpich conflicts openmpi \
166+
variant mpich conflicts openmpi \
166167
description {Add MPI parallelization using MPICH} {
167168
set c_variant [c_variant_name]
168169
if {${c_variant} == ""} {
@@ -183,13 +184,9 @@ For multi-processing, wrap gyoto in mpirun-openmpi-${mpi_suffix}, e.g.:
183184
build.args-delete CC="${configure.cc}"
184185
build.args-append CC="mpicc-mpich-${mpi_suffix}"
185186
notes "
186-
+-- Gyoto Usage note ------------------------------------------------------
187-
| For multi-processing, wrap gyoto in mpirun-mpich-${mpi_suffix}, e.g.:
188-
| $ mpirun-mpich-${mpi_suffix} gyoto -P4 in.xml out.fits
189-
+--------------------------------------------------------------------------
190-
"
191-
}
192-
193-
} else {
194-
configure.args-append --disable-c++11
187+
+-- Gyoto Usage note ------------------------------------------------------
188+
| For multi-processing, wrap gyoto in mpirun-mpich-${mpi_suffix}, e.g.:
189+
| $ mpirun-mpich-${mpi_suffix} gyoto -P4 in.xml out.fits
190+
+--------------------------------------------------------------------------
191+
"
195192
}

0 commit comments

Comments
 (0)