Thu Jan 12 11:34:10 2023 UTC ()
openmpi: tell it where sysconfdir is


(markd)
diff -r1.51 -r1.52 pkgsrc/parallel/openmpi/Makefile

cvs diff -r1.51 -r1.52 pkgsrc/parallel/openmpi/Makefile (switch to unified diff)

--- pkgsrc/parallel/openmpi/Makefile 2022/08/25 22:09:14 1.51
+++ pkgsrc/parallel/openmpi/Makefile 2023/01/12 11:34:10 1.52
@@ -1,85 +1,86 @@ @@ -1,85 +1,86 @@
1# $NetBSD: Makefile,v 1.51 2022/08/25 22:09:14 thor Exp $ 1# $NetBSD: Makefile,v 1.52 2023/01/12 11:34:10 markd Exp $
2 2
3DISTNAME= openmpi-4.1.4 3DISTNAME= openmpi-4.1.4
4CATEGORIES= parallel 4CATEGORIES= parallel
5MASTER_SITES= https://download.open-mpi.org/release/open-mpi/v4.1/ 5MASTER_SITES= https://download.open-mpi.org/release/open-mpi/v4.1/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= thor@NetBSD.org 8MAINTAINER= thor@NetBSD.org
9HOMEPAGE= https://www.open-mpi.org/ 9HOMEPAGE= https://www.open-mpi.org/
10COMMENT= Open source MPI-3.1 implementation 10COMMENT= Open source MPI-3.1 implementation
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13CONFLICTS= mpich-[0-9]* 13CONFLICTS= mpich-[0-9]*
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= perl:run bash:run 17USE_TOOLS+= perl:run bash:run
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIG_SHELL= bash 19CONFIG_SHELL= bash
 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
20CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package 21CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package
21CONFIGURE_ARGS+= --with-libltdl=${BUILDLINK_PREFIX.libltdl} 22CONFIGURE_ARGS+= --with-libltdl=${BUILDLINK_PREFIX.libltdl}
22# See below about external hwloc. 23# See below about external hwloc.
23#CONFIGURE_ARGS+= --with-hwloc=${BUILDLINK_PREFIX.hwloc} 24#CONFIGURE_ARGS+= --with-hwloc=${BUILDLINK_PREFIX.hwloc}
24# OSHM Needs additional dependencies and also is surpassed with proper MPI 25# OSHM Needs additional dependencies and also is surpassed with proper MPI
25# functionality. Rare use cases. 26# functionality. Rare use cases.
26CONFIGURE_ARGS+= --disable-oshmem 27CONFIGURE_ARGS+= --disable-oshmem
27CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0 28CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0
28LIBTOOL_OVERRIDE= libtool \ 29LIBTOOL_OVERRIDE= libtool \
29 ompi/contrib/vt/vt/extlib/otf/libtool \ 30 ompi/contrib/vt/vt/extlib/otf/libtool \
30 ompi/contrib/vt/vt/libtool \ 31 ompi/contrib/vt/vt/libtool \
31 ompi/mca/io/romio/romio/libtool 32 ompi/mca/io/romio/romio/libtool
32SHLIBTOOL_OVERRIDE= config/libtool.m4 33SHLIBTOOL_OVERRIDE= config/libtool.m4
33 34
34.include "options.mk" 35.include "options.mk"
35 36
36TEST_TARGET= check 37TEST_TARGET= check
37 38
38# Unsurprisingly, files that are only produced on GNU/Linux systems. 39# Unsurprisingly, files that are only produced on GNU/Linux systems.
39PLIST_VARS+= linux 40PLIST_VARS+= linux
40# \todo Explain. Apparently built if !Linux. 41# \todo Explain. Apparently built if !Linux.
41PLIST_VARS+= pstattest 42PLIST_VARS+= pstattest
42# \todo Explain. 43# \todo Explain.
43PLIST_VARS+= ignoretkr 44PLIST_VARS+= ignoretkr
44PLIST_VARS+= noignoretkr 45PLIST_VARS+= noignoretkr
45 46
46 47
47.if ${OPSYS} == "Linux" 48.if ${OPSYS} == "Linux"
48PLIST.linux= yes 49PLIST.linux= yes
49.endif 50.endif
50 51
51.if ${OPSYS} != "Linux" 52.if ${OPSYS} != "Linux"
52PLIST.pstattest= yes 53PLIST.pstattest= yes
53.endif 54.endif
54 55
55.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 56.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
56PLIST.ignoretkr= yes 57PLIST.ignoretkr= yes
57.else 58.else
58# \todo Explain why on Darwin we don't set one of them. 59# \todo Explain why on Darwin we don't set one of them.
59. if ${OPSYS} != "Darwin" 60. if ${OPSYS} != "Darwin"
60PLIST.noignoretkr= yes 61PLIST.noignoretkr= yes
61. endif 62. endif
62.endif 63.endif
63 64
64REPLACE_PERL= ompi/tools/wrappers/mpijavac.pl.in 65REPLACE_PERL= ompi/tools/wrappers/mpijavac.pl.in
65REPLACE_PERL+= ompi/mca/common/monitoring/*.pl 66REPLACE_PERL+= ompi/mca/common/monitoring/*.pl
66 67
67EGDIR= ${PREFIX}/share/examples/openmpi 68EGDIR= ${PREFIX}/share/examples/openmpi
68CONF_SAMPLES+= openmpi-default-hostfile openmpi-mca-params.conf 69CONF_SAMPLES+= openmpi-default-hostfile openmpi-mca-params.conf
69CONF_SAMPLES+= pmix-mca-params.conf 70CONF_SAMPLES+= pmix-mca-params.conf
70.for i in ${CONF_SAMPLES} 71.for i in ${CONF_SAMPLES}
71CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} 72CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
72.endfor 73.endfor
73 74
74INSTALLATION_DIRS+= ${EGDIR} 75INSTALLATION_DIRS+= ${EGDIR}
75 76
76post-install: 77post-install:
77.for i in ${CONF_SAMPLES} 78.for i in ${CONF_SAMPLES}
78 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/${i} ${DESTDIR}${EGDIR}/${i} 79 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/${i} ${DESTDIR}${EGDIR}/${i}
79.endfor 80.endfor
80 81
81.include "../../devel/libltdl/buildlink3.mk" 82.include "../../devel/libltdl/buildlink3.mk"
82# Too old, use internal hwloc 2 instead. As hwloc 2 API/ABI is incompatible, 83# Too old, use internal hwloc 2 instead. As hwloc 2 API/ABI is incompatible,
83# upgrade has to be considered carefully. 84# upgrade has to be considered carefully.
84#.include "../../parallel/hwloc/buildlink3.mk" 85#.include "../../parallel/hwloc/buildlink3.mk"
85.include "../../mk/bsd.pkg.mk" 86.include "../../mk/bsd.pkg.mk"