svn commit: r561280 - head/net/openmpi

[Mark Linimon]

Author: linimon
Date: Mon Jan 11 21:44:55 2021
New Revision: 561280
URL: https://svnweb.freebsd.org/changeset/ports/561280

Log:
  Fix build on !x86 systems by ensuring option AVX cannot be set:
  
    pkg-static: Unable to access file /wrkdirs/usr/ports/net/openmpi/work/stage/usr/local/%%AVX%%mpi/openmpi/lib/openmpi/mca_op_avx.la:No such file or directory
    pkg-static: Unable to access file /wrkdirs/usr/ports/net/openmpi/work/stage/usr/local/%%AVX%%mpi/openmpi/lib/openmpi/mca_op_avx.so:No such file or directory
  
  While here, sort the _DESC entries, and gather the OPTIONS_DEFAULT,
  OPTIONS_EXCLUDE_*, and OPTIONS_SUB entries together.
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/net/openmpi/Makefile

Modified: head/net/openmpi/Makefile
==============================================================================
--- head/net/openmpi/Makefile	Mon Jan 11 21:36:26 2021	(r561279)
+++ head/net/openmpi/Makefile	Mon Jan 11 21:44:55 2021	(r561280)
@@ -58,13 +58,23 @@ MANPREFIX=	${PREFIX}/${MPIDIR}
 SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
 		ompi/mca/common/monitoring/aggregate_profile.pl
 
-OPTIONS_DEFINE=	AVX DEBUG IPV6 SLURM TORQUE
+OPTIONS_DEFINE=			AVX DEBUG IPV6 SLURM TORQUE
+OPTIONS_DEFAULT=		SLURM
+OPTIONS_EXCLUDE_aarch64=	AVX
+OPTIONS_EXCLUDE_armv6=		AVX
+OPTIONS_EXCLUDE_armv7=		AVX
+OPTIONS_EXCLUDE_i386=		SLURM
+OPTIONS_EXCLUDE_mips=		AVX
+OPTIONS_EXCLUDE_mips64=		AVX
+OPTIONS_EXCLUDE_powerpc=	AVX
+OPTIONS_EXCLUDE_powerpc64=	AVX
+OPTIONS_EXCLUDE_powerpc64le=	AVX
+OPTIONS_EXCLUDE_riscv64=	AVX
+OPTIONS_SUB=			yes
+
 AVX_DESC=	Enable AVX instructions
-TORQUE_DESC=	Enable Torque support
 SLURM_DESC=	Enable SLURM support
-OPTIONS_DEFAULT=	SLURM
-OPTIONS_EXCLUDE_i386=	SLURM
-OPTIONS_SUB=	yes
+TORQUE_DESC=	Enable Torque support
 
 AVX_CONFIGURE_OFF=	--enable-mca-no-build=op-avx