diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-30 16:32:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-03-30 19:05:39 (GMT) |
| commit | 919de8785b8781a78f69c102226d8ca65eff526c (patch) | |
| tree | 079c11c5b99a35d46123c5d99ed330e845970d22 /.gitlab/ci | |
| parent | 4901fdb201bc6264e976e105780a490d9c0eba19 (diff) | |
| download | CMake-919de8785b8781a78f69c102226d8ca65eff526c.zip CMake-919de8785b8781a78f69c102226d8ca65eff526c.tar.gz CMake-919de8785b8781a78f69c102226d8ca65eff526c.tar.bz2 | |
ci: Patch HDF5 Fortran compiler wrappers in Fedora jobs
In Fedora's HDF5 packages for OpenMPI and MPICH, the `h5pfc` compiler
wrappers for Fortran use the wrong search path for their Fortran
modules. Patch them locally in CI jobs until it is fixed in Fedora
upstream.
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_fedora37_makefiles.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/env_fedora37_makefiles.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_fedora37_makefiles.cmake b/.gitlab/ci/configure_fedora37_makefiles.cmake index 0a271bf..c2f9982 100644 --- a/.gitlab/ci/configure_fedora37_makefiles.cmake +++ b/.gitlab/ci/configure_fedora37_makefiles.cmake @@ -36,7 +36,7 @@ set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER "/usr/lib64/mpich/bin/h5pfc" CACH set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER "/usr/lib64/openmpi/bin/h5pcc" CACHE FILEPATH "") set(CMake_TEST_FindHDF5_OpenMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/openmpi/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/openmpi/lib" CACHE STRING "") # set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/lib64/openmpi/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist -# set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/lib64/openmpi/bin/h5pfc" CACHE FILEPATH "") # cannot find its own hdf5.mod +set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/lib64/openmpi/bin/h5pfc" CACHE FILEPATH "") set(CMake_TEST_FindHDF5_Serial_C_COMPILER "/usr/bin/h5cc" CACHE FILEPATH "") set(CMake_TEST_FindHDF5_Serial_CXX_COMPILER "/usr/bin/h5c++" CACHE FILEPATH "") set(CMake_TEST_FindHDF5_Serial_Fortran_COMPILER "/usr/bin/h5fc" CACHE FILEPATH "") diff --git a/.gitlab/ci/env_fedora37_makefiles.sh b/.gitlab/ci/env_fedora37_makefiles.sh index 217ff30..c482642 100644 --- a/.gitlab/ci/env_fedora37_makefiles.sh +++ b/.gitlab/ci/env_fedora37_makefiles.sh @@ -1,3 +1,8 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then source .gitlab/ci/ispc-env.sh fi + +# Patch HDF5 Fortran compiler wrappers to work around Fedora bug. +# https://bugzilla.redhat.com/show_bug.cgi?id=2183289 +sed -i '/^includedir=/ s|/mpich-x86_64||' /usr/lib64/mpich/bin/h5pfc +sed -i '/^includedir=/ s|/openmpi-x86_64||' /usr/lib64/openmpi/bin/h5pfc |