diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /net/openmpi4 | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'net/openmpi4')
3 files changed, 20 insertions, 22 deletions
diff --git a/net/openmpi4/Makefile b/net/openmpi4/Makefile index 984a90e8b3a8..072fcd88c251 100644 --- a/net/openmpi4/Makefile +++ b/net/openmpi4/Makefile @@ -1,7 +1,8 @@ PORTNAME= openmpi -PORTVERSION= 4.1.8 +DISTVERSION= 4.1.8 +PORTREVISION= 1 CATEGORIES= net parallel -MASTER_SITES= https://download.open-mpi.org/release/open-mpi/v${PORTVERSION:R}/ +MASTER_SITES= https://download.open-mpi.org/release/open-mpi/v${DISTVERSION:R}/ PKGNAMESUFFIX= 4 MAINTAINER= ports@FreeBSD.org @@ -11,7 +12,7 @@ WWW= https://www.open-mpi.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 \ +LIB_DEPENDS= libhwloc.so:devel/hwloc2 \ libltdl.so:devel/libltdl \ libevent.so:devel/libevent \ libmunge.so:security/munge @@ -19,19 +20,17 @@ LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 \ # :keepla because port uses lt_dlopen USES= fortran gmake libtool:keepla localbase perl5 \ pkgconfig shebangfix tar:bzip2 - -CONFLICTS_INSTALL= openmpi-5* - -USE_PERL5= build - MPIBASE?= mpi MPIDIR?= ${MPIBASE}/${PORTNAME} +USE_LDCONFIG= ${PREFIX}/${MPIDIR}/lib +USE_PERL5= build -PLIST_SUB+= MPIDIR=${MPIDIR} +SHEBANG_FILES= ompi/mca/common/monitoring/profile2mat.pl \ + ompi/mca/common/monitoring/aggregate_profile.pl GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${PREFIX}/${MPIDIR} GNU_CONFIGURE_MANPREFIX=${PREFIX}/${MPIDIR}/share +GNU_CONFIGURE_PREFIX= ${PREFIX}/${MPIDIR} CONFIGURE_ARGS+= --program-prefix= \ --with-hwloc=external \ --with-libltdl \ @@ -45,16 +44,15 @@ CONFIGURE_ARGS+= --program-prefix= \ --with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \ ompi_cv_fortran_ignore_tkr_data=0 -USE_LDCONFIG= ${PREFIX}/${MPIDIR}/lib +TEST_TARGET= check -MANDIRS= ${PREFIX}/${MPIDIR}/share/man +PIE_UNSAFE= yes -TEST_TARGET= check +CONFLICTS_INSTALL= openmpi-5* -SHEBANG_FILES= ompi/mca/common/monitoring/profile2mat.pl \ - ompi/mca/common/monitoring/aggregate_profile.pl +MANDIRS= ${PREFIX}/${MPIDIR}/share/man -PIE_UNSAFE= yes +PLIST_SUB+= MPIDIR=${MPIDIR} OPTIONS_DEFINE= AVX DEBUG IPV6 SLURM OPTIONS_DEFAULT= SLURM @@ -80,8 +78,8 @@ DEBUG_INSTALL_TARGET_OFF= install-strip IPV6_CONFIGURE_ENABLE= ipv6 -SLURM_CONFIGURE_WITH= slurm SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm +SLURM_CONFIGURE_WITH= slurm SLURM_PLIST_FILES= ${MPIDIR}/lib/openmpi/mca_ess_slurm.la \ ${MPIDIR}/lib/openmpi/mca_ess_slurm.so \ ${MPIDIR}/lib/openmpi/mca_plm_slurm.la \ diff --git a/net/openmpi4/files/patch-ompi_mca_sharedfp_sm_sharedfp__sm.h b/net/openmpi4/files/patch-ompi_mca_sharedfp_sm_sharedfp__sm.h index 929884acd3bf..0508e78b6a96 100644 --- a/net/openmpi4/files/patch-ompi_mca_sharedfp_sm_sharedfp__sm.h +++ b/net/openmpi4/files/patch-ompi_mca_sharedfp_sm_sharedfp__sm.h @@ -1,5 +1,5 @@ ---- ompi/mca/sharedfp/sm/sharedfp_sm.h.orig 2022-04-01 19:57:04.609982000 +0200 -+++ ompi/mca/sharedfp/sm/sharedfp_sm.h 2022-04-01 19:57:19.417411000 +0200 +--- ompi/mca/sharedfp/sm/sharedfp_sm.h.orig 2025-02-04 17:12:40 UTC ++++ ompi/mca/sharedfp/sm/sharedfp_sm.h @@ -29,6 +29,7 @@ #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/common/ompio/common_ompio.h" diff --git a/net/openmpi4/files/patch-opal_mca_pmix_pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c b/net/openmpi4/files/patch-opal_mca_pmix_pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c index 2718655bf401..d4d2b02c1efe 100644 --- a/net/openmpi4/files/patch-opal_mca_pmix_pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c +++ b/net/openmpi4/files/patch-opal_mca_pmix_pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c @@ -1,6 +1,6 @@ ---- opal/mca/pmix/pmix3x/pmix/src/mca/pshmem/mmap/pshmem_mmap.c.orig 2020-04-12 11:49:10 UTC +--- opal/mca/pmix/pmix3x/pmix/src/mca/pshmem/mmap/pshmem_mmap.c.orig 2025-02-04 17:12:41 UTC +++ opal/mca/pmix/pmix3x/pmix/src/mca/pshmem/mmap/pshmem_mmap.c -@@ -79,6 +79,9 @@ static int _mmap_segment_create(pmix_pshmem_seg_t *sm_ +@@ -65,6 +65,9 @@ static int _mmap_segment_create(pmix_pshmem_seg_t *sm_ if (0 != (rc = posix_fallocate(sm_seg->seg_id, 0, size))) { pmix_output_verbose(2, pmix_globals.debug_output, "sys call posix_fallocate(2) fail\n"); @@ -10,7 +10,7 @@ if (ENOSPC == rc) { rc = PMIX_ERR_OUT_OF_RESOURCE; goto out; -@@ -98,6 +101,7 @@ static int _mmap_segment_create(pmix_pshmem_seg_t *sm_ +@@ -84,6 +87,7 @@ static int _mmap_segment_create(pmix_pshmem_seg_t *sm_ goto map_memory; } #endif |