From 0b9f5476d3f05b5f2f7f49ccf146af4357ea7684 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 4 Jan 2018 00:11:09 +0100
Subject: sys-libs/libomp: Update CMake option names

Closes: https://bugs.gentoo.org/642412
---
 sys-libs/libomp/libomp-6.0.9999.ebuild | 7 ++++---
 sys-libs/libomp/libomp-9999.ebuild     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'sys-libs')

diff --git a/sys-libs/libomp/libomp-6.0.9999.ebuild b/sys-libs/libomp/libomp-6.0.9999.ebuild
index a5949315fe72..461064323a15 100644
--- 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 219ed6080119..630a7bf4f050 100644
--- 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
 }
-- 
cgit v1.2.3-65-gdbad