| 1 |
commit: 0b9f5476d3f05b5f2f7f49ccf146af4357ea7684 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 3 23:11:09 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 3 23:35:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9f5476 |
| 7 |
|
| 8 |
sys-libs/libomp: Update CMake option names |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/642412 |
| 11 |
|
| 12 |
sys-libs/libomp/libomp-6.0.9999.ebuild | 7 ++++--- |
| 13 |
sys-libs/libomp/libomp-9999.ebuild | 7 ++++--- |
| 14 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libomp/libomp-6.0.9999.ebuild b/sys-libs/libomp/libomp-6.0.9999.ebuild |
| 17 |
index a5949315fe7..461064323a1 100644 |
| 18 |
--- a/sys-libs/libomp/libomp-6.0.9999.ebuild |
| 19 |
+++ b/sys-libs/libomp/libomp-6.0.9999.ebuild |
| 20 |
@@ -62,8 +62,7 @@ pkg_setup() { |
| 21 |
multilib_src_configure() { |
| 22 |
local libdir="$(get_libdir)" |
| 23 |
local mycmakeargs=( |
| 24 |
- -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}" |
| 25 |
- -DLIBOMPTARGET_LIBDIR_SUFFIX="${libdir#lib}" |
| 26 |
+ -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" |
| 27 |
|
| 28 |
-DLIBOMP_USE_HWLOC=$(usex hwloc) |
| 29 |
-DLIBOMP_OMPT_SUPPORT=$(usex ompt) |
| 30 |
@@ -71,11 +70,13 @@ multilib_src_configure() { |
| 31 |
-DLIBOMP_INSTALL_ALIASES=OFF |
| 32 |
# disable unnecessary hack copying stuff back to srcdir |
| 33 |
-DLIBOMP_COPY_EXPORTS=OFF |
| 34 |
- -DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")" |
| 35 |
) |
| 36 |
use test && mycmakeargs+=( |
| 37 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 38 |
-DLLVM_LIT_ARGS="-vv" |
| 39 |
+ |
| 40 |
+ -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" |
| 41 |
+ -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" |
| 42 |
) |
| 43 |
cmake-utils_src_configure |
| 44 |
} |
| 45 |
|
| 46 |
diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild |
| 47 |
index 219ed608011..630a7bf4f05 100644 |
| 48 |
--- a/sys-libs/libomp/libomp-9999.ebuild |
| 49 |
+++ b/sys-libs/libomp/libomp-9999.ebuild |
| 50 |
@@ -61,8 +61,7 @@ pkg_setup() { |
| 51 |
multilib_src_configure() { |
| 52 |
local libdir="$(get_libdir)" |
| 53 |
local mycmakeargs=( |
| 54 |
- -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}" |
| 55 |
- -DLIBOMPTARGET_LIBDIR_SUFFIX="${libdir#lib}" |
| 56 |
+ -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" |
| 57 |
|
| 58 |
-DLIBOMP_USE_HWLOC=$(usex hwloc) |
| 59 |
-DLIBOMP_OMPT_SUPPORT=$(usex ompt) |
| 60 |
@@ -70,11 +69,13 @@ multilib_src_configure() { |
| 61 |
-DLIBOMP_INSTALL_ALIASES=OFF |
| 62 |
# disable unnecessary hack copying stuff back to srcdir |
| 63 |
-DLIBOMP_COPY_EXPORTS=OFF |
| 64 |
- -DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")" |
| 65 |
) |
| 66 |
use test && mycmakeargs+=( |
| 67 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 68 |
-DLLVM_LIT_ARGS="-vv" |
| 69 |
+ |
| 70 |
+ -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" |
| 71 |
+ -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" |
| 72 |
) |
| 73 |
cmake-utils_src_configure |
| 74 |
} |
Archives