Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gyoto: fix the build with libstdc++ #27045

Merged
merged 2 commits into from
Dec 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 22 additions & 27 deletions science/Gyoto/Portfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-13

port lint Gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-13

port lint py39-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-13

port lint py310-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-13

port lint py311-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-13

port lint py312-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint Gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint py39-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint py310-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint py311-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint py312-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint Gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint py39-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint py310-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint py311-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

Check warning on line 1 in science/Gyoto/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint py312-gyoto: Warning: Version '2.0.2+20241208' contains '+' character, which makes it difficult to specify on the command line due to conflict with variant syntax.

PortSystem 1.0
PortGroup github 1.0
PortGroup active_variants 1.1
PortGroup compilers 1.0
PortGroup boost 1.0
PortGroup compilers 1.0
PortGroup github 1.0

github.setup gyoto Gyoto 74a1bd863b5f2855044b656314297d85e346ef41
version 2.0.2+20241208
Expand All @@ -26,14 +26,17 @@
homepage https://gyoto.obspm.fr
github.tarball_from archive

depends_build port:LORENE \
port:pkgconfig \
port:eigen3
depends_build path:share/pkgconfig/eigen3.pc:eigen3 \
port:LORENE \
path:bin/pkg-config:pkgconfig

depends_lib port:cfitsio \
port:xercesc3 \
port:flint \
port:udunits2 \
port:flint
port:xercesc3

# xercesc3 requires C++11; notice that eigen3-devel needs C++14.
compiler.cxx_standard 2011

configure.args --without-yorick \
--with-lorene=${prefix}/lib/lorene \
Expand Down Expand Up @@ -61,10 +64,8 @@
Makefile bin/Makefile lib/Makefile
}


build.args-append Y_CFLAGS="${configure.cxxflags}" Y_CPPFLAGS="${configure.cppflags}" CC="${configure.cc}" COPT_DEFAULT="" Y_LDFLAGS="${configure.ldflags}"


test.target check check-lorene
test.run yes

Expand Down Expand Up @@ -134,11 +135,9 @@
}
}

if {[string match libc++ ${configure.cxx_stdlib}]} {

compilers.enforce_c [boost::depends_portname]
compilers.enforce_c [boost::depends_portname]

variant openmpi conflicts mpich \
variant openmpi conflicts mpich \
description {Add MPI parallelization using OpenMPI} {
set c_variant [c_variant_name]
if {${c_variant} == ""} {
Expand All @@ -159,12 +158,12 @@
build.args-delete CC="${configure.cc}"
build.args-append CC="mpicc-openmpi-${mpi_suffix}"
notes "
For multi-processing, wrap gyoto in mpirun-openmpi-${mpi_suffix}, e.g.:
$ mpirun-openmpi-${mpi_suffix} gyoto -P4 in.xml out.fits
"
}
For multi-processing, wrap gyoto in mpirun-openmpi-${mpi_suffix}, e.g.:
$ mpirun-openmpi-${mpi_suffix} gyoto -P4 in.xml out.fits
"
}

variant mpich conflicts openmpi \
variant mpich conflicts openmpi \
description {Add MPI parallelization using MPICH} {
set c_variant [c_variant_name]
if {${c_variant} == ""} {
Expand All @@ -185,13 +184,9 @@
build.args-delete CC="${configure.cc}"
build.args-append CC="mpicc-mpich-${mpi_suffix}"
notes "
+-- Gyoto Usage note ------------------------------------------------------
| For multi-processing, wrap gyoto in mpirun-mpich-${mpi_suffix}, e.g.:
| $ mpirun-mpich-${mpi_suffix} gyoto -P4 in.xml out.fits
+--------------------------------------------------------------------------
"
}

} else {
configure.args-append --disable-c++11
+-- Gyoto Usage note ------------------------------------------------------
| For multi-processing, wrap gyoto in mpirun-mpich-${mpi_suffix}, e.g.:
| $ mpirun-mpich-${mpi_suffix} gyoto -P4 in.xml out.fits
+--------------------------------------------------------------------------
"
}
Loading