Merge branch '4.0'

Drop python 2 for RHEL8+ as well; Drop old java conditional
Update to 4.0.4
2020-06-19 21:10:17 -06:00 · 2020-06-19 21:09:57 -06:00 · 2020-06-17 21:36:26 -06:00 · 2020-06-17 21:36:26 -06:00 · 2020-06-17 21:36:26 -06:00 · 2020-06-17 21:36:26 -06:00
10 changed files with 883 additions and 179 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-openmpi-1.4.1-RH.tar.bz2
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,54 @@
+openmpi-1.4.1-RH.tar.bz2
+/openmpi-1.5-RH.tar.bz2
+/openmpi-1.5.4-clean.tar.bz2
+/openmpi-1.5.5-clean.tar.bz2
+/openmpi-1.6.tar.bz2
+/openmpi-1.6-clean.tar.bz2
+/openmpi-1.6.1-clean.tar.xz
+/openmpi-1.6.2-clean.tar.xz
+/openmpi-1.6.3-clean.tar.xz
+/openmpi-1.6.4-clean.tar.bz2
+/openmpi-1.6.4-clean.tar.xz
+/openmpi-1.7-clean.tar.xz
+/openmpi-1.7.1-clean.tar.xz
+/openmpi-1.7.2-clean.tar.xz
+/openmpi-1.7.3.tar.bz2
+/openmpi-1.7.4.tar.bz2
+/openmpi-1.7.5.tar.bz2
+/openmpi-1.8.tar.bz2
+/openmpi-1.8.1.tar.bz2
+/openmpi-1.8.2.tar.bz2
+/openmpi-1.8.3.tar.bz2
+/openmpi-1.8.4.tar.bz2
+/openmpi-v1.8.4-99-gd83fb30.tar.gz
+/openmpi-v1.8.4-134-g9ad2aa8.tar.bz2
+/openmpi-1.8.5rc1.tar.bz2
+/openmpi-1.8.5rc3.tar.bz2
+/openmpi-1.8.5.tar.bz2
+/openmpi-1.8.6.tar.bz2
+/openmpi-1.8.7.tar.bz2
+/openmpi-1.8.8.tar.bz2
+/openmpi-1.10.0.tar.bz2
+/openmpi-1.10.1.tar.bz2
+/openmpi-1.10.2.tar.bz2
+/openmpi-1.10.3.tar.bz2
+/openmpi-1.10.4.tar.bz2
+/openmpi-2.0.1.tar.bz2
+/openmpi-2.0.2.tar.bz2
+/openmpi-2.1.0.tar.bz2
+/openmpi-2.1.1.tar.bz2
+/openmpi-2.1.5.tar.bz2
+/openmpi-2.1.6rc1.tar.bz2
+/openmpi-2.1.6.tar.bz2
+/openmpi-3.1.3.tar.bz2
+/openmpi-3.1.4.tar.bz2
+/openmpi-4.0.0.tar.bz2
+/openmpi-4.0.1.tar.bz2
+/openmpi-4.0.2rc1.tar.bz2
+/openmpi-4.0.2rc2.tar.bz2
+/openmpi-4.0.2.tar.bz2
+/openmpi-4.0.3rc3.tar.bz2
+/openmpi-4.0.3rc4.tar.bz2
+/openmpi-4.0.3.tar.bz2
+/openmpi-4.0.4rc1.tar.bz2
+/openmpi-4.0.4.tar.bz2
--- a/.rpmlint
+++ b/.rpmlint
@ -0,0 +1,6 @@
+from Config import *
+addFilter("shared-library-calls-exit .*/lib(mpi|open-rte|oshmem|_java)\.so");
+# We use environment modules to load these paths
+addFilter("file-not-in-%lang /usr/share/man/openmpi-");
+addFilter("invalid-locale-man-dir /usr/share/man/openmpi-");
+addFilter("library-without-ldconfig-post[iu]n /usr/lib(|64)/openmpi/");
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: openmpi
-# $Id$
-NAME := openmpi
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/macros.openmpi
+++ b/macros.openmpi
@ -1,7 +1,7 @@
 %_openmpi_load \
 . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
+ module load mpi/openmpi-%{_arch}; \
+ export OMPI_MCA_rmaps_base_oversubscribe=1
 %_openmpi_unload \
 . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
+ module unload mpi/openmpi-%{_arch};
--- a/openmpi.module.in
+++ b/openmpi.module.in
@ -1,17 +1,21 @@
 #%Module 1.0
 #
 #  OpenMPI module for use with 'environment-modules' package:
-# 
+#
+conflict		mpi
 prepend-path 		PATH 		@LIBDIR@/bin
 prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
-prepend-path		PYTHONPATH	@PYSITEARCH@
+prepend-path 		PKG_CONFIG_PATH	@LIBDIR@/lib/pkgconfig
+prepend-path		MANPATH		:@MANDIR@
 setenv 			MPI_BIN		@LIBDIR@/bin
 setenv			MPI_SYSCONFIG	@ETCDIR@
 setenv			MPI_FORTRAN_MOD_DIR	@FMODDIR@
 setenv			MPI_INCLUDE	@INCDIR@
 setenv	 		MPI_LIB		@LIBDIR@/lib
 setenv			MPI_MAN		@MANDIR@
-setenv			MPI_PYTHON_SITEARCH	@PYSITEARCH@
+setenv			MPI_PYTHON_SITEARCH	@PY2SITEARCH@
+setenv			MPI_PYTHON2_SITEARCH	@PY2SITEARCH@
+setenv			MPI_PYTHON3_SITEARCH	@PY3SITEARCH@
 setenv			MPI_COMPILER	@COMPILER@
 setenv			MPI_SUFFIX	@SUFFIX@
 setenv	 		MPI_HOME	@LIBDIR@
--- a/openmpi.pth.py2
+++ b/openmpi.pth.py2
@ -0,0 +1 @@
+import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s))
--- a/openmpi.pth.py3
+++ b/openmpi.pth.py3
@ -0,0 +1 @@
+import sys, os; s = os.getenv('MPI_PYTHON3_SITEARCH'); s and (s in sys.path or sys.path.append(s))
--- a/openmpi.spec
+++ b/openmpi.spec
--- a/2
+++ b/2
@ -1 +1 @@
-0a343ebe72050f6795a132a8d6df876e  openmpi-1.4.1-RH.tar.bz2
+SHA512 (openmpi-4.0.4.tar.bz2) = 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
				`@ -0,0 +1 @@`
				`import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s))`