Diff openmpi-4.1.4-r1 with a openmpi-4.1.5

/usr/portage/sys-cluster/openmpi/openmpi-4.1.5.ebuild 2023-10-09 14:52:35.464368501 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6 6
FORTRAN_NEEDED=fortran
7

  
8
inherit cuda fortran-2 java-pkg-opt-2 multilib-minimal
7
inherit cuda fortran-2 multilib-minimal
9 8

  
10 9
MY_P=${P/-mpi}
11
S=${WORKDIR}/${MY_P}
12 10

  
13 11
IUSE_OPENMPI_FABRICS="
14 12
	openmpi_fabrics_ofed
......
27 25
DESCRIPTION="A high-performance message passing library (MPI)"
28 26
HOMEPAGE="https://www.open-mpi.org"
29 27
SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
28
S="${WORKDIR}/${MY_P}"
30 29

  
31 30
LICENSE="BSD"
32 31
SLOT="0"
33
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux"
34
IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio valgrind
32
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
33
IUSE="cma cuda cxx fortran ipv6 libompitrace peruse romio valgrind
35 34
	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
36 35

  
37 36
REQUIRED_USE="
......
42 41
	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
43 42
	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
44 43

  
45
CDEPEND="
44
RDEPEND="
46 45
	!sys-cluster/mpich
47 46
	!sys-cluster/mpich2
48 47
	!sys-cluster/nullmpi
......
56 55
	openmpi_rm_pbs? ( sys-cluster/torque )
57 56
	openmpi_rm_slurm? ( sys-cluster/slurm )
58 57
	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
59

  
60
RDEPEND="${CDEPEND}
61
	java? ( >=virtual/jre-1.8:* )"
62

  
63
DEPEND="${CDEPEND}
64
	java? ( >=virtual/jdk-1.8:* )
58
DEPEND="${RDEPEND}
65 59
	valgrind? ( dev-util/valgrind )"
66 60

  
67 61
MULTILIB_WRAPPED_HEADERS=(
68 62
	/usr/include/mpi.h
69
	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
70 63
	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
71 64
)
72 65

  
73 66
pkg_setup() {
74 67
	fortran-2_pkg_setup
75
	java-pkg-opt-2_pkg_setup
76 68

  
77 69
	elog
78 70
	elog "OpenMPI has an overwhelming count of configuration options."
......
94 86
}
95 87

  
96 88
multilib_src_configure() {
97
	if use java; then
98
		# We must always build with the right -source and -target
99
		# flags. Passing flags to javac isn't explicitly supported here
100
		# but we can cheat by overriding the configure test for javac.
101
		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
102
	fi
103

  
104 89
	local myconf=(
90
		--disable-mpi-java
105 91
		# configure takes a looooong time, but upstream currently force
106 92
		# constriants on caching:
107 93
		# https://github.com/open-mpi/ompi/blob/9eec56222a5c98d13790c9ee74877f1562ac27e8/config/opal_config_subdir.m4#L118
......
131 117

  
132 118
		$(use_with cma)
133 119

  
134
		$(multilib_native_use_enable java mpi-java)
135 120
		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
136 121
		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
137 122
		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
......
177 162
	# Remove la files, no static libs are installed and we have pkg-config
178 163
	find "${ED}" -name '*.la' -delete || die
179 164

  
180
	if use java; then
181
		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
182
		java-pkg_dojar "${mpi_jar}"
183
		# We don't want to install the jar file twice
184
		# so let's clean after ourselves.
185
		rm "${mpi_jar}" || die
186
	fi
187 165
	einstalldocs
188 166
}
Thank you!