From owner-svn-ports-head@freebsd.org Mon Jan 11 21:44:55 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7CDB4E7A24; Mon, 11 Jan 2021 21:44:55 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DF6gW4vGzz3DB9; Mon, 11 Jan 2021 21:44:55 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9AD602195A; Mon, 11 Jan 2021 21:44:55 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10BLitxf016376; Mon, 11 Jan 2021 21:44:55 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10BLitPV016375; Mon, 11 Jan 2021 21:44:55 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202101112144.10BLitPV016375@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Mon, 11 Jan 2021 21:44:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561280 - head/net/openmpi X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/net/openmpi X-SVN-Commit-Revision: 561280 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2021 21:44:55 -0000 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