Date: Thu, 23 Sep 2021 14:15:51 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9dcc929303fc - main - net/openmpi: fix packaging on armv* Message-ID: <202109231415.18NEFpUi025258@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9dcc929303fc7716cd58306288d8b848b1909f38 commit 9dcc929303fc7716cd58306288d8b848b1909f38 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-09-23 14:09:23 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2021-09-23 14:09:23 +0000 net/openmpi: fix packaging on armv* From opal/mca/patcher/overwrite/configure.m4: --- net/openmpi/Makefile | 8 ++++++-- net/openmpi/pkg-plist | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile index 1f29c891273b..ec9cac64cece 100644 --- a/net/openmpi/Makefile +++ b/net/openmpi/Makefile @@ -9,8 +9,6 @@ COMMENT= High Performance Message Passing Library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_armv6= fails to package: pkg-static: mca_patcher_overwrite.la: No such file or directory -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.15:devel/hwloc2 \ @@ -110,6 +108,12 @@ SLURM_PLIST_FILES= ${MPIDIR}/lib/openmpi/mca_ess_slurm.la \ FCFLAGS+= -fallow-argument-mismatch .endif +.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && !${ARCH:Mpowerpc*} +PLIST_SUB+= NO_MCA_PATCHER_OVERWRITE="@comment " +.else +PLIST_SUB+= NO_MCA_PATCHER_OVERWRITE="" +.endif + post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g' \ ${WRKSRC}/ompi/tools/wrappers/Makefile.am \ diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist index c8449700be76..d8259b4f3b9f 100644 --- a/net/openmpi/pkg-plist +++ b/net/openmpi/pkg-plist @@ -237,8 +237,8 @@ libdata/pkgconfig/pmix.pc %%MPIDIR%%/lib/openmpi/mca_osc_rdma.so %%MPIDIR%%/lib/openmpi/mca_osc_sm.la %%MPIDIR%%/lib/openmpi/mca_osc_sm.so -%%MPIDIR%%/lib/openmpi/mca_patcher_overwrite.la -%%MPIDIR%%/lib/openmpi/mca_patcher_overwrite.so +%%NO_MCA_PATCHER_OVERWRITE%%%%MPIDIR%%/lib/openmpi/mca_patcher_overwrite.la +%%NO_MCA_PATCHER_OVERWRITE%%%%MPIDIR%%/lib/openmpi/mca_patcher_overwrite.so %%MPIDIR%%/lib/openmpi/mca_plm_isolated.la %%MPIDIR%%/lib/openmpi/mca_plm_isolated.so %%MPIDIR%%/lib/openmpi/mca_plm_rsh.la
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109231415.18NEFpUi025258>