From nobody Sat Dec 30 17:08:57 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2THG0HW9z55d8Q; Sat, 30 Dec 2023 17:08:58 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2THF6c1mz4Fqf; Sat, 30 Dec 2023 17:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703956137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PWhLh56cx522Jpn90j15WvyJNbp8PwTrP4kiqec6hM=; b=Eu53w0d0I4VyPM11Zm7l7cD5PqxlgC6EQ6B+YZOLhYUJ4fn9txfL+c0ySnQYd1sksESVIe RUBdb0LE3FJPKhHaAL5+eJ40F711FG3vUIFkS9TL81DCORiT7RDcQLLP00A+PJQEgXJKbB yR2oPnpTOMFxH2P1/FnJEAPu81jocuNulHe6n6ZjGmEKsrmIEt9Ap2aponfKRxdZNjXA58 lqtPeM0y1sanTb9HMAxWLIfOPFU3qSjm/x9eSUJZAaRWnD9bCniBWQu4qoT5/rMwfLtCUU kwxUKlA9qo1beQNIczNk25dAXZyZg9jmg81UVVfE7E7udsFO3S7ZJja/OrJOtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703956137; a=rsa-sha256; cv=none; b=Wh/UkDhENc1HWiunKhi6UFAN4G6xNSyTL7E8j9j2IwFE5pBuHHLO6Y7A0rEyY9oNddAIHO QFHC3eXdjXEKRmt87MwsuNkjrzWwwQHkpimI29yduLkExLSsTvoxJEasnN48kudPMWWSpZ UX0adg1qCT0Ko+fIeAjsZHDCH10wmSsp+sUcpRqyPPUecN6/dyVi4sqvhBTtdA42Silmt/ kfommtdfw5o4pL3z/Vq7TDAFu6hHU3t81b7V8nnGbvomA9xUJk2DQrpFGDgQ/cLypPneRk auWpOtlT76QWaoLy+nIm7c+QufpmXOpx8bespuitAiHdj/vaxFfteddIDxJVMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703956137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PWhLh56cx522Jpn90j15WvyJNbp8PwTrP4kiqec6hM=; b=IHPnRtmCj3fuBQf9loaWemTXWDe5Th/MxaFvL7UYTgrrNATcvijO+0g/PEpA/Sd6sjof/2 UhmFO0qwLKOs6Kv40W1YsJuCz/iSJea0koJbHMMWjycmkqmkuhJENKXpsWMrpBzyKjjXQG UFMWAtyP57KOVvTj8dOSwnrNRxK8XGJRrWIKu2g9SRN7HpdDEQXEsmIV7FVm2QI/Znk+4W EF1mp2JX3ux/9R7Zq/NtebNUBfD10ec33D/AI1XxxTQCadIRuVayG+I+Q5VLYqAYZLov8Z LD8Jqsoz3QpLYSS+U17E8Oe3omxK/6JVYx16/OvQSG1w5yiptCOOqTibkBiPTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2THF5TvSzyCy; Sat, 30 Dec 2023 17:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BUH8v2s087712; Sat, 30 Dec 2023 17:08:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUH8v9i087709; Sat, 30 Dec 2023 17:08:57 GMT (envelope-from git) Date: Sat, 30 Dec 2023 17:08:57 GMT Message-Id: <202312301708.3BUH8v9i087709@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 19f52c082821 - main - Revert "net/openmpi: Remove dependency" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19f52c082821b172205ce2669ef8d3a3adb881ba Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=19f52c082821b172205ce2669ef8d3a3adb881ba commit 19f52c082821b172205ce2669ef8d3a3adb881ba Author: Muhammad Moinur Rahman AuthorDate: 2023-12-30 17:08:09 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-30 17:08:09 +0000 Revert "net/openmpi: Remove dependency" This reverts commit 9f2583dd1a5db69e3291bf72cff7ec5e4e48fdb2. torque is required by openmpi. Reported by: thierry --- net/openmpi/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile index ac5aba976934..767f8d701dce 100644 --- a/net/openmpi/Makefile +++ b/net/openmpi/Makefile @@ -54,7 +54,7 @@ MANPREFIX= ${PREFIX}/${MPIDIR} SHEBANG_FILES= ompi/mca/common/monitoring/profile2mat.pl \ ompi/mca/common/monitoring/aggregate_profile.pl -OPTIONS_DEFINE= AVX DEBUG IPV6 SLURM +OPTIONS_DEFINE= AVX DEBUG IPV6 SLURM TORQUE OPTIONS_DEFAULT= SLURM OPTIONS_EXCLUDE_aarch64= AVX OPTIONS_EXCLUDE_armv6= AVX SLURM @@ -70,6 +70,7 @@ OPTIONS_SUB= yes AVX_DESC= Enable AVX instructions SLURM_DESC= Enable SLURM support +TORQUE_DESC= Enable Torque support AVX_CONFIGURE_OFF= --enable-mca-no-build=op-avx @@ -78,6 +79,17 @@ DEBUG_INSTALL_TARGET_OFF= install-strip IPV6_CONFIGURE_ENABLE= ipv6 +TORQUE_CONFIGURE_WITH= tm +TORQUE_LIB_DEPENDS= libtorque.so:sysutils/torque +TORQUE_PLIST_FILES= ${MPIDIR}/lib/openmpi/mca_plm_tm.so \ + ${MPIDIR}/lib/openmpi/mca_plm_tm.la \ + ${MPIDIR}/lib/openmpi/mca_ras_tm.la \ + ${MPIDIR}/lib/openmpi/mca_ras_tm.so \ + ${MPIDIR}/lib/openmpi/mca_ess_tm.so \ + ${MPIDIR}/lib/openmpi/mca_ess_tm.la \ + ${MPIDIR}/share/openmpi/help-plm-tm.txt \ + ${MPIDIR}/share/openmpi/help-ras-tm.txt + SLURM_CONFIGURE_WITH= slurm SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm SLURM_PLIST_FILES= ${MPIDIR}/lib/openmpi/mca_ess_slurm.la \