| 1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 2 |
--- |
| 3 |
sys-libs/libomp/libomp-10.0.1.9999.ebuild | 14 ++------------ |
| 4 |
sys-libs/libomp/libomp-10.0.1_rc1.ebuild | 14 ++------------ |
| 5 |
sys-libs/libomp/libomp-11.0.0.9999.ebuild | 14 ++------------ |
| 6 |
3 files changed, 6 insertions(+), 36 deletions(-) |
| 7 |
|
| 8 |
diff --git a/sys-libs/libomp/libomp-10.0.1.9999.ebuild b/sys-libs/libomp/libomp-10.0.1.9999.ebuild |
| 9 |
index 01e5f189d659..5bffd6685f64 100644 |
| 10 |
--- a/sys-libs/libomp/libomp-10.0.1.9999.ebuild |
| 11 |
+++ b/sys-libs/libomp/libomp-10.0.1.9999.ebuild |
| 12 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 13 |
|
| 14 |
CMAKE_ECLASS=cmake |
| 15 |
PYTHON_COMPAT=( python3_{6..9} ) |
| 16 |
-inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1 |
| 17 |
+inherit cmake-multilib linux-info llvm.org python-any-r1 |
| 18 |
|
| 19 |
DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" |
| 20 |
HOMEPAGE="https://openmp.llvm.org" |
| 21 |
@@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl |
| 22 |
>=sys-devel/clang-6 |
| 23 |
)" |
| 24 |
|
| 25 |
-# least intrusive of all |
| 26 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 27 |
- |
| 28 |
python_check_deps() { |
| 29 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 30 |
} |
| 31 |
@@ -67,13 +64,6 @@ pkg_setup() { |
| 32 |
use test && python-any-r1_pkg_setup |
| 33 |
} |
| 34 |
|
| 35 |
-src_prepare() { |
| 36 |
- # cmake eclasses suck by forcing ${S} here |
| 37 |
- CMAKE_USE_DIR=${S} \ |
| 38 |
- S=${WORKDIR} \ |
| 39 |
- cmake_src_prepare |
| 40 |
-} |
| 41 |
- |
| 42 |
multilib_src_configure() { |
| 43 |
local libdir="$(get_libdir)" |
| 44 |
local mycmakeargs=( |
| 45 |
@@ -98,7 +88,7 @@ multilib_src_configure() { |
| 46 |
use test && mycmakeargs+=( |
| 47 |
# this project does not use standard LLVM cmake macros |
| 48 |
-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" |
| 49 |
- -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 50 |
+ -DOPENMP_LIT_ARGS="$(get_lit_flags)" |
| 51 |
|
| 52 |
-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" |
| 53 |
-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" |
| 54 |
diff --git a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild |
| 55 |
index 01e5f189d659..5bffd6685f64 100644 |
| 56 |
--- a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild |
| 57 |
+++ b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild |
| 58 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 59 |
|
| 60 |
CMAKE_ECLASS=cmake |
| 61 |
PYTHON_COMPAT=( python3_{6..9} ) |
| 62 |
-inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1 |
| 63 |
+inherit cmake-multilib linux-info llvm.org python-any-r1 |
| 64 |
|
| 65 |
DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" |
| 66 |
HOMEPAGE="https://openmp.llvm.org" |
| 67 |
@@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl |
| 68 |
>=sys-devel/clang-6 |
| 69 |
)" |
| 70 |
|
| 71 |
-# least intrusive of all |
| 72 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 73 |
- |
| 74 |
python_check_deps() { |
| 75 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 76 |
} |
| 77 |
@@ -67,13 +64,6 @@ pkg_setup() { |
| 78 |
use test && python-any-r1_pkg_setup |
| 79 |
} |
| 80 |
|
| 81 |
-src_prepare() { |
| 82 |
- # cmake eclasses suck by forcing ${S} here |
| 83 |
- CMAKE_USE_DIR=${S} \ |
| 84 |
- S=${WORKDIR} \ |
| 85 |
- cmake_src_prepare |
| 86 |
-} |
| 87 |
- |
| 88 |
multilib_src_configure() { |
| 89 |
local libdir="$(get_libdir)" |
| 90 |
local mycmakeargs=( |
| 91 |
@@ -98,7 +88,7 @@ multilib_src_configure() { |
| 92 |
use test && mycmakeargs+=( |
| 93 |
# this project does not use standard LLVM cmake macros |
| 94 |
-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" |
| 95 |
- -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 96 |
+ -DOPENMP_LIT_ARGS="$(get_lit_flags)" |
| 97 |
|
| 98 |
-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" |
| 99 |
-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" |
| 100 |
diff --git a/sys-libs/libomp/libomp-11.0.0.9999.ebuild b/sys-libs/libomp/libomp-11.0.0.9999.ebuild |
| 101 |
index 01e5f189d659..5bffd6685f64 100644 |
| 102 |
--- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild |
| 103 |
+++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild |
| 104 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 105 |
|
| 106 |
CMAKE_ECLASS=cmake |
| 107 |
PYTHON_COMPAT=( python3_{6..9} ) |
| 108 |
-inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1 |
| 109 |
+inherit cmake-multilib linux-info llvm.org python-any-r1 |
| 110 |
|
| 111 |
DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" |
| 112 |
HOMEPAGE="https://openmp.llvm.org" |
| 113 |
@@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl |
| 114 |
>=sys-devel/clang-6 |
| 115 |
)" |
| 116 |
|
| 117 |
-# least intrusive of all |
| 118 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 119 |
- |
| 120 |
python_check_deps() { |
| 121 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 122 |
} |
| 123 |
@@ -67,13 +64,6 @@ pkg_setup() { |
| 124 |
use test && python-any-r1_pkg_setup |
| 125 |
} |
| 126 |
|
| 127 |
-src_prepare() { |
| 128 |
- # cmake eclasses suck by forcing ${S} here |
| 129 |
- CMAKE_USE_DIR=${S} \ |
| 130 |
- S=${WORKDIR} \ |
| 131 |
- cmake_src_prepare |
| 132 |
-} |
| 133 |
- |
| 134 |
multilib_src_configure() { |
| 135 |
local libdir="$(get_libdir)" |
| 136 |
local mycmakeargs=( |
| 137 |
@@ -98,7 +88,7 @@ multilib_src_configure() { |
| 138 |
use test && mycmakeargs+=( |
| 139 |
# this project does not use standard LLVM cmake macros |
| 140 |
-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" |
| 141 |
- -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 142 |
+ -DOPENMP_LIT_ARGS="$(get_lit_flags)" |
| 143 |
|
| 144 |
-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" |
| 145 |
-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" |
| 146 |
-- |
| 147 |
2.27.0 |
Archives