sys-libs/libomp: Update CMake option names

Closes: https://bugs.gentoo.org/642412

diff --git a/sys-libs/libomp/libomp-6.0.9999.ebuild b/sys-libs/libomp/libomp-6.0.9999.ebuild
index a5949315fe72c8f4573f130ef3bf89de68ecacf8..461064323a1513638aa393670e635325c1588dcd 100644 (file)
--- a/sys-libs/libomp/libomp-6.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-6.0.9999.ebuild
@@ -62,8 +62,7 @@ pkg_setup() {
 multilib_src_configure() {
        local libdir="$(get_libdir)"
        local mycmakeargs=(
-               -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}"
-               -DLIBOMPTARGET_LIBDIR_SUFFIX="${libdir#lib}"
+               -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
 
                -DLIBOMP_USE_HWLOC=$(usex hwloc)
                -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
@@ -71,11 +70,13 @@ multilib_src_configure() {
                -DLIBOMP_INSTALL_ALIASES=OFF
                # disable unnecessary hack copying stuff back to srcdir
                -DLIBOMP_COPY_EXPORTS=OFF
-               -DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")"
        )
        use test && mycmakeargs+=(
                -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
                -DLLVM_LIT_ARGS="-vv"
+
+               -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+               -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
        )
        cmake-utils_src_configure
 }

diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild
index 219ed608011902cacd5af6cd8a260d61ba82e322..630a7bf4f0501c659bf563b621bd8eb0bff156d1 100644 (file)
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -61,8 +61,7 @@ pkg_setup() {
 multilib_src_configure() {
        local libdir="$(get_libdir)"
        local mycmakeargs=(
-               -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}"
-               -DLIBOMPTARGET_LIBDIR_SUFFIX="${libdir#lib}"
+               -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
 
                -DLIBOMP_USE_HWLOC=$(usex hwloc)
                -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
@@ -70,11 +69,13 @@ multilib_src_configure() {
                -DLIBOMP_INSTALL_ALIASES=OFF
                # disable unnecessary hack copying stuff back to srcdir
                -DLIBOMP_COPY_EXPORTS=OFF
-               -DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")"
        )
        use test && mycmakeargs+=(
                -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
                -DLLVM_LIT_ARGS="-vv"
+
+               -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+               -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
        )
        cmake-utils_src_configure
 }