[gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mfem/

["Alessandro Barbieri" <lssndrbarbieri@gmail.com>]

commit:     e637b097f31bc596ae4fc96e4bb562ecfde21592
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed May 25 12:16:06 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed May 25 12:17:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e637b097

sci-libs/mfem: multiple fixes

Respect multilib
Allow multiple amdgpu implementations
Fix include path discovery

Closes: https://bugs.gentoo.org/847355
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sci-libs/mfem/mfem-4.4.ebuild | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/sci-libs/mfem/mfem-4.4.ebuild b/sci-libs/mfem/mfem-4.4.ebuild
index 4df7996a6..166720d0e 100644
--- a/sci-libs/mfem/mfem-4.4.ebuild
+++ b/sci-libs/mfem/mfem-4.4.ebuild
@@ -86,7 +86,7 @@ PATCHES=( "${FILESDIR}/${P}-bump-cmake-version.patch" )
 RESTRICT="!test? ( test )"
 DOCS=( README CHANGELOG CITATION.cff )
 REQUIRED_USE="
-	hip? ( ^^ ( ${IUSE_AMDGPU/+/} ) )
+	hip? ( || ( ${IUSE_AMDGPU/+/} ) )
 	mpi? ( metis )
 	mumps? ( mpi )
 	petsc? ( mpi )
@@ -97,18 +97,18 @@ REQUIRED_USE="
 #pumi? ( mpi )
 #?? ( cuda hip )
 
-src_prepare() {
-	sed -e "s|\"\${CMAKE_INSTALL_PREFIX}/lib\"|\"\${CMAKE_INSTALL_PREFIX}/$(get_libdir)\"|g" -i config/cmake/modules/MfemCmakeUtilities.cmake || die
-	cmake_src_prepare
-}
-
 src_configure() {
-	for u in ${IUSE_AMDGPU} ; do
-		if use ${u} ; then
-			export HIP_ARCH="${u/amdgpu_/}"
-			break
-		fi
-	done
+	if use hip ; then
+		HIP_ARCH=""
+		for u in ${IUSE_AMDGPU} ; do
+			if use ${u} ; then
+				HIP_ARCH="${HIP_ARCH},${u/amdgpu_/}"
+			fi
+		done
+		# remove first character (,)
+		HIP_ARCH="${HIP_ARCH:1}"
+		export HIP_ARCH
+	fi
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DMFEM_ENABLE_MINIAPPS=ON
@@ -156,10 +156,10 @@ src_configure() {
 		-DMFEM_USE_ZLIB=$(usex zlib)
 	)
 	if use codipack; then
-		mycmakeargs+=( "-DCODIPACK_INCLUDE_DIRS=${EPREFIX}/usr/include/codi" )
+		mycmakeargs+=( "-DCODIPACK_INCLUDE_DIR=${EPREFIX}/usr/include/codi" )
 	fi
 	if use mpi; then
-		mycmakeargs+=( "-DHYPRE_INCLUDE_DIRS=${EPREFIX}/usr/include/hypre" )
+		mycmakeargs+=( "-DHYPRE_INCLUDE_DIR=${EPREFIX}/usr/include/hypre" )
 	fi
 	if use petsc; then
 		mycmakeargs+=( "-DPETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc" )
@@ -179,4 +179,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	einstalldocs
+	# https://github.com/mfem/mfem/issues/3019
+	mv "${ED}/usr/lib" _lib || die
+	mv _lib "${ED}/usr/$(get_libdir)" || die
 }