diff --git a/srcpkgs/openmpi/patches/fortran-flags.patch b/srcpkgs/openmpi/patches/fortran-flags.patch new file mode 100644 index 00000000000..870425d67a4 --- /dev/null +++ b/srcpkgs/openmpi/patches/fortran-flags.patch @@ -0,0 +1,61 @@ +Workaound for missing -I/usr/include in the OpenMPI FORTRAN wrapper, which +breaks includes of OpenMPI FORTRAN definitions. + +Upstream issue: https://github.com/open-mpi/ompi/issues/12257 +Void issue: https://github.com/void-linux/void-packages/issues/49322 +Arch inspiration: https://gitlab.archlinux.org/archlinux/packaging/packages/openmpi/-/blob/main/PKGBUILD + +--- a/opal/tools/wrappers/opal_wrapper.c ++++ b/opal/tools/wrappers/opal_wrapper.c +@@ -59,8 +59,7 @@ + #define OPAL_INCLUDE_FLAG "-I" + #define OPAL_LIBDIR_FLAG "-L" + +-static const char * filtered_args[] = { "-I/usr/include", +- "-L/usr/lib", ++static const char * filtered_args[] = { "-L/usr/lib", + "-L/usr/lib64", + NULL }; + +--- a/configure ++++ b/configure +@@ -212365,8 +212365,8 @@ + + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OMPI_WRAPPER_EXTRA_FCFLAGS" >&5 +-printf "%s\n" "$OMPI_WRAPPER_EXTRA_FCFLAGS" >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OMPI_WRAPPER_FCFLAGS" >&5 ++printf "%s\n" "$OMPI_WRAPPER_FCFLAGS" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OMPI wrapper FCFLAGS_PREFIX" >&5 + printf %s "checking for OMPI wrapper FCFLAGS_PREFIX... " >&6; } +@@ -213138,7 +213138,7 @@ + printf "%s\n" "#define OMPI_WRAPPER_CXXFLAGS \"$OMPI_WRAPPER_CXXFLAGS\"" >>confdefs.h + + +-printf "%s\n" "#define OMPI_WRAPPER_FCFLAGS \"$OMPI_WRAPPER__FCFLAGS\"" >>confdefs.h ++printf "%s\n" "#define OMPI_WRAPPER_FCFLAGS \"$OMPI_WRAPPER_FCFLAGS\"" >>confdefs.h + + + printf "%s\n" "#define OMPI_WRAPPER_LDFLAGS \"$OMPI_WRAPPER_LDFLAGS\"" >>confdefs.h +@@ -213310,8 +213310,8 @@ + + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OSHMEM_WRAPPER_EXTRA_FCFLAGS" >&5 +-printf "%s\n" "$OSHMEM_WRAPPER_EXTRA_FCFLAGS" >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OSHMEM_WRAPPER_FCFLAGS" >&5 ++printf "%s\n" "$OSHMEM_WRAPPER_FCFLAGS" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OSHMEM wrapper FCFLAGS_PREFIX" >&5 + printf %s "checking for OSHMEM wrapper FCFLAGS_PREFIX... " >&6; } +@@ -214098,7 +214098,7 @@ + printf "%s\n" "#define OSHMEM_WRAPPER_CXXFLAGS \"$OSHMEM_WRAPPER_CXXFLAGS\"" >>confdefs.h + + +-printf "%s\n" "#define OSHMEM_WRAPPER_FCFLAGS \"$OSHMEM_WRAPPER__FCFLAGS\"" >>confdefs.h ++printf "%s\n" "#define OSHMEM_WRAPPER_FCFLAGS \"$OSHMEM_WRAPPER_FCFLAGS\"" >>confdefs.h + + + printf "%s\n" "#define OSHMEM_WRAPPER_LDFLAGS \"$OSHMEM_WRAPPER_LDFLAGS\"" >>confdefs.h diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 94db17d0669..7ed9ab54d7e 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -1,6 +1,6 @@ # Template file for 'openmpi' pkgname=openmpi -version=5.0.2 +version=5.0.3 revision=1 # OpenMPI >= 5 is 64-bit only archs="x86_64* aarch64* ppc64* riscv64*" @@ -15,8 +15,8 @@ short_desc="High Performance Message Passing Library" maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://www.open-mpi.org/" -distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=ee46ad8eeee2c3ff70772160bff877cbf38c330a0bc3b3ddc811648b3396698f +distfiles="https://download.open-mpi.org/release/open-mpi/v${version%.*}/openmpi-${version}.tar.bz2" +checksum=990582f206b3ab32e938aa31bbf07c639368e4405dca196fabe7f0f76eeda90b lib32disabled=yes if [ "${CROSS_BUILD}" ]; then