From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B14B615801E for ; Sun, 3 Oct 2021 06:04:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 135DDE08EF; Sun, 3 Oct 2021 06:04:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBAC6E08EF for ; Sun, 3 Oct 2021 06:04:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5328342E41 for ; Sun, 3 Oct 2021 06:04:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7654A12F for ; Sun, 3 Oct 2021 06:04:11 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1633241048.f51d8525dc6850b01616424147ba5d06c7f7d78a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libomp/libomp-13.0.0.9999.ebuild sys-libs/libomp/libomp-13.0.0.ebuild sys-libs/libomp/libomp-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/libomp/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f51d8525dc6850b01616424147ba5d06c7f7d78a X-VCS-Branch: master Date: Sun, 3 Oct 2021 06:04:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 783f989f-0faf-4272-990f-8006ef0ac29a X-Archives-Hash: 450633516fbe041ee8cda4c6ff8fc81d commit: f51d8525dc6850b01616424147ba5d06c7f7d78a Author: Michał Górny gentoo org> AuthorDate: Sat Oct 2 11:47:55 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Oct 3 06:04:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51d8525 sys-libs/libomp: Ensure NDEBUG correctly Signed-off-by: Michał Górny gentoo.org> sys-libs/libomp/libomp-13.0.0.9999.ebuild | 5 ++++- sys-libs/libomp/libomp-13.0.0.ebuild | 5 ++++- sys-libs/libomp/libomp-14.0.0.9999.ebuild | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys-libs/libomp/libomp-13.0.0.9999.ebuild b/sys-libs/libomp/libomp-13.0.0.9999.ebuild index 5adaa0dfbca..bf8f376ce98 100644 --- a/sys-libs/libomp/libomp-13.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://openmp.llvm.org" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="cuda hwloc kernel_linux offload ompt test" +IUSE="cuda debug hwloc kernel_linux offload ompt test" # CUDA works only with the x86_64 ABI REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" RESTRICT="!test? ( test )" @@ -66,6 +66,9 @@ pkg_setup() { } multilib_src_configure() { + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + local libdir="$(get_libdir)" local mycmakeargs=( -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" diff --git a/sys-libs/libomp/libomp-13.0.0.ebuild b/sys-libs/libomp/libomp-13.0.0.ebuild index 136466d1b9a..db94fb5536f 100644 --- a/sys-libs/libomp/libomp-13.0.0.ebuild +++ b/sys-libs/libomp/libomp-13.0.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://openmp.llvm.org" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" -IUSE="cuda hwloc kernel_linux offload ompt test" +IUSE="cuda debug hwloc kernel_linux offload ompt test" # CUDA works only with the x86_64 ABI REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" RESTRICT="!test? ( test )" @@ -67,6 +67,9 @@ pkg_setup() { } multilib_src_configure() { + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + local libdir="$(get_libdir)" local mycmakeargs=( -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild b/sys-libs/libomp/libomp-14.0.0.9999.ebuild index 5adaa0dfbca..bf8f376ce98 100644 --- a/sys-libs/libomp/libomp-14.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://openmp.llvm.org" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="cuda hwloc kernel_linux offload ompt test" +IUSE="cuda debug hwloc kernel_linux offload ompt test" # CUDA works only with the x86_64 ABI REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" RESTRICT="!test? ( test )" @@ -66,6 +66,9 @@ pkg_setup() { } multilib_src_configure() { + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + local libdir="$(get_libdir)" local mycmakeargs=( -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"