62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
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
|