From owner-svn-ports-all@freebsd.org  Sat Jan  9 14:16:52 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 8267E4D5F89;
 Sat,  9 Jan 2021 14:16:52 +0000 (UTC)
 (envelope-from danilo@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 4DChqS3JGyz3HNy;
 Sat,  9 Jan 2021 14:16:52 +0000 (UTC)
 (envelope-from danilo@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 63BB117052;
 Sat,  9 Jan 2021 14:16:52 +0000 (UTC)
 (envelope-from danilo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 109EGqCu046599;
 Sat, 9 Jan 2021 14:16:52 GMT (envelope-from danilo@FreeBSD.org)
Received: (from danilo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 109EGqmw046598;
 Sat, 9 Jan 2021 14:16:52 GMT (envelope-from danilo@FreeBSD.org)
Message-Id: <202101091416.109EGqmw046598@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danilo set sender to
 danilo@FreeBSD.org using -f
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Sat, 9 Jan 2021 14:16:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r560866 - head/net/openmpi3
X-SVN-Group: ports-head
X-SVN-Commit-Author: danilo
X-SVN-Commit-Paths: head/net/openmpi3
X-SVN-Commit-Revision: 560866
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jan 2021 14:16:52 -0000

Author: danilo
Date: Sat Jan  9 14:16:51 2021
New Revision: 560866
URL: https://svnweb.freebsd.org/changeset/ports/560866

Log:
  net/openmpi3: Use the embedded hwloc library to workaround a conflict between hwloc and hwloc2 due sysutils/slurm-wlm.
  
  OpenMPI3 is not compatible with hwloc2. Also, OpenMPI3 was deprecated by upstream and will be removed from the ports tree as soon as all the ports which depend on it are moved to net/openmpi.
  
  PR:		252496

Modified:
  head/net/openmpi3/Makefile

Modified: head/net/openmpi3/Makefile
==============================================================================
--- head/net/openmpi3/Makefile	Sat Jan  9 14:12:59 2021	(r560865)
+++ head/net/openmpi3/Makefile	Sat Jan  9 14:16:51 2021	(r560866)
@@ -2,6 +2,7 @@
 
 PORTNAME=	openmpi
 PORTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 PKGNAMESUFFIX=	3
@@ -16,8 +17,7 @@ BROKEN_armv6=		fails to package: pkg-static: mca_patch
 BROKEN_armv7=		fails to package: pkg-static: mca_patcher_overwrite.la: No such file or directory
 BROKEN_sparc64=		fails to compile on sparc64
 
-LIB_DEPENDS=	libhwloc.so:devel/hwloc \
-		libltdl.so:devel/libltdl \
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libevent.so:devel/libevent \
 		libmunge.so:security/munge
 
@@ -38,7 +38,7 @@ PLIST_SUB+=	MPIDIR=${MPIDIR}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--mandir=${PREFIX}/${MPIDIR}/man \
 			--program-prefix= \
-			--with-hwloc=external \
+			--with-hwloc=internal \
 			--with-libltdl \
 			--enable-mpi-fortran=usempi \
 			--enable-mpi-cxx \