Date: Thu, 23 Sep 2021 16:19:11 +0200 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Piotr Kubaj <pkubaj@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 9dcc929303fc - main - net/openmpi: fix packaging on armv* Message-ID: <YUyM37h6aXz06Azv@KGPE-D16> In-Reply-To: <202109231415.18NEFpUi025258@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Oops, I didn't paste the actual code, but it's: #if !defined(__i386__) && !defined(__x86_64__) && !defined(__PPC__) && !defined(__aarch64__) #error "platform not supported" #endif On 21-09-23 14:15:51, Piotr Kubaj wrote: > 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmFMjN8ACgkQelmbhSCD nJ1xlBAAsJbGNTEM9U+XProzKx5KR4HReMcNU1Up9JyUoHMEARYE4Zg/8Z2vNmpy tW9lfWlOpUQy0/oHVeTRKBLFOQRtdTbr8tas7bDcjhthjRZwGFTAmk2QUyg43bKU Eoln9yB9ren105AZL8rlcfU3WHnKjWzO10BEh5CXDzPdqGa+uBY7qe3UhKnrLgHL JrqeBDE+ZO7Ek+u6Arib7Y+LxRRzdNtetRKDi3NSK9TgMywjApwxyC1Sm5IJKGA3 xXui/BsVOFMh7VxqweOn6uOXb3c85w9javniBENzEssdsFmC86gpC9rbs+AFl544 wYEpq/F4YwyjHGii5ryEm3mI4pbYXHpqNckYfMx6jT2a+EoAkX0ja+s1CY8KZYCF u1S3JImiwL1qDwJtWubnrSP74E6QBH/dQHzKF7D/bTz7Foy86cEfLTJBvqiXAZYH GfKOXbAjjzIx6ptf6imaAufp9XNHL5Al/awksMbveEogUYnvHqSKmD6NnBc6ZkGh PJVaXOcGwCSbOZvTyOD90Q86GAYW9RB37V5cuJJ6VrdcEzrUc2QOFI9T7QNuOvpo XfofH+OOTf1QIFD4nMi4ep9JxBi66kPameUKaYzkYTmE26dBCtDjFgvPPDjPuasi HXOHAoRzPpGnTKG8puwDg4TWO2HfYciENJU8CZAFew0VXiwFSgc= =OmKq -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YUyM37h6aXz06Azv>