pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openmpi: Minor pkglint fixups



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jul 31 20:22:52 2022 -0400
Changeset:	b5536b746bfc9ae48c21f553de2c9c95a5425773

Modified Files:
	openmpi/Makefile
	openmpi/buildlink3.mk

Log Message:
openmpi: Minor pkglint fixups

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b5536b746bfc9ae48c21f553de2c9c95a5425773

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openmpi/Makefile      | 12 ++++++------
 openmpi/buildlink3.mk |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/openmpi/Makefile b/openmpi/Makefile
index a18ab8e033..c23d09114c 100644
--- a/openmpi/Makefile
+++ b/openmpi/Makefile
@@ -14,7 +14,7 @@ CONFLICTS=	mpich-[0-9]*
 
 USE_LANGUAGES=		c c++ fortran
 USE_LIBTOOL=		yes
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run bash:run
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_PREFIX=	${MPI_PREFIX}
 CONFIG_SHELL=		bash
@@ -24,11 +24,11 @@ CONFIGURE_ARGS+=	--with-libltdl=${BUILDLINK_PREFIX.libltdl}
 CONFIGURE_ARGS+=	--with-hwloc=${BUILDLINK_PREFIX.hwloc}
 CONFIGURE_ARGS+=	--with-wrapper-ldflags="-L${MPI_PREFIX}/lib ${LINKER_RPATH_FLAG}${MPI_PREFIX}/lib"
 CONFIGURE_ARGS+=	OPAL_HAVE_LTDL_ADVISE=0
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool \
-			${WRKSRC}/ompi/contrib/vt/vt/extlib/otf/libtool \
-			${WRKSRC}/ompi/contrib/vt/vt/libtool \
-			${WRKSRC}/ompi/mca/io/romio/romio/libtool
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/config/libtool.m4
+LIBTOOL_OVERRIDE=	libtool \
+			ompi/contrib/vt/vt/extlib/otf/libtool \
+			ompi/contrib/vt/vt/libtool \
+			ompi/mca/io/romio/romio/libtool
+SHLIBTOOL_OVERRIDE=	config/libtool.m4
 
 # Prevent detection of OpenMP support in order to make PLIST consistent
 BUILDLINK_TRANSFORM=	rm:-fopenmp
diff --git a/openmpi/buildlink3.mk b/openmpi/buildlink3.mk
index 27ed288826..95cd6d6b90 100644
--- a/openmpi/buildlink3.mk
+++ b/openmpi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/10/24 05:49:26 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2022/06/28 11:35:24 wiz Exp $
 
 BUILDLINK_TREE+=	openmpi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	openmpi
 OPENMPI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openmpi+=	openmpi>=1.5.1
-BUILDLINK_PKGSRCDIR.openmpi?=	../../parallel/openmpi
+BUILDLINK_PKGSRCDIR.openmpi?=	../../wip/openmpi
 
 MPI_SUBPREFIX=  openmpi4
 MPI_PREFIX=     ${PREFIX}/${MPI_SUBPREFIX}


Home | Main Index | Thread Index | Old Index