| 1 |
commit: f51d8525dc6850b01616424147ba5d06c7f7d78a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 2 11:47:55 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 3 06:04:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51d8525 |
| 7 |
|
| 8 |
sys-libs/libomp: Ensure NDEBUG correctly |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libomp/libomp-13.0.0.9999.ebuild | 5 ++++- |
| 13 |
sys-libs/libomp/libomp-13.0.0.ebuild | 5 ++++- |
| 14 |
sys-libs/libomp/libomp-14.0.0.9999.ebuild | 5 ++++- |
| 15 |
3 files changed, 12 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/libomp/libomp-13.0.0.9999.ebuild b/sys-libs/libomp/libomp-13.0.0.9999.ebuild |
| 18 |
index 5adaa0dfbca..bf8f376ce98 100644 |
| 19 |
--- a/sys-libs/libomp/libomp-13.0.0.9999.ebuild |
| 20 |
+++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild |
| 21 |
@@ -13,7 +13,7 @@ HOMEPAGE="https://openmp.llvm.org" |
| 22 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="" |
| 25 |
-IUSE="cuda hwloc kernel_linux offload ompt test" |
| 26 |
+IUSE="cuda debug hwloc kernel_linux offload ompt test" |
| 27 |
# CUDA works only with the x86_64 ABI |
| 28 |
REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" |
| 29 |
RESTRICT="!test? ( test )" |
| 30 |
@@ -66,6 +66,9 @@ pkg_setup() { |
| 31 |
} |
| 32 |
|
| 33 |
multilib_src_configure() { |
| 34 |
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 |
| 35 |
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" |
| 36 |
+ |
| 37 |
local libdir="$(get_libdir)" |
| 38 |
local mycmakeargs=( |
| 39 |
-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" |
| 40 |
|
| 41 |
diff --git a/sys-libs/libomp/libomp-13.0.0.ebuild b/sys-libs/libomp/libomp-13.0.0.ebuild |
| 42 |
index 136466d1b9a..db94fb5536f 100644 |
| 43 |
--- a/sys-libs/libomp/libomp-13.0.0.ebuild |
| 44 |
+++ b/sys-libs/libomp/libomp-13.0.0.ebuild |
| 45 |
@@ -13,7 +13,7 @@ HOMEPAGE="https://openmp.llvm.org" |
| 46 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 47 |
SLOT="0" |
| 48 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" |
| 49 |
-IUSE="cuda hwloc kernel_linux offload ompt test" |
| 50 |
+IUSE="cuda debug hwloc kernel_linux offload ompt test" |
| 51 |
# CUDA works only with the x86_64 ABI |
| 52 |
REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" |
| 53 |
RESTRICT="!test? ( test )" |
| 54 |
@@ -67,6 +67,9 @@ pkg_setup() { |
| 55 |
} |
| 56 |
|
| 57 |
multilib_src_configure() { |
| 58 |
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 |
| 59 |
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" |
| 60 |
+ |
| 61 |
local libdir="$(get_libdir)" |
| 62 |
local mycmakeargs=( |
| 63 |
-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" |
| 64 |
|
| 65 |
diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild b/sys-libs/libomp/libomp-14.0.0.9999.ebuild |
| 66 |
index 5adaa0dfbca..bf8f376ce98 100644 |
| 67 |
--- a/sys-libs/libomp/libomp-14.0.0.9999.ebuild |
| 68 |
+++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild |
| 69 |
@@ -13,7 +13,7 @@ HOMEPAGE="https://openmp.llvm.org" |
| 70 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="" |
| 73 |
-IUSE="cuda hwloc kernel_linux offload ompt test" |
| 74 |
+IUSE="cuda debug hwloc kernel_linux offload ompt test" |
| 75 |
# CUDA works only with the x86_64 ABI |
| 76 |
REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" |
| 77 |
RESTRICT="!test? ( test )" |
| 78 |
@@ -66,6 +66,9 @@ pkg_setup() { |
| 79 |
} |
| 80 |
|
| 81 |
multilib_src_configure() { |
| 82 |
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 |
| 83 |
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" |
| 84 |
+ |
| 85 |
local libdir="$(get_libdir)" |
| 86 |
local mycmakeargs=( |
| 87 |
-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" |
Archives