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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C1849158089 for ; Sun, 10 Sep 2023 14:17:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCB4F2BC017; Sun, 10 Sep 2023 14:17:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA1A32BC017 for ; Sun, 10 Sep 2023 14:17:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CE7B335C9F for ; Sun, 10 Sep 2023 14:17:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 099B610DC for ; Sun, 10 Sep 2023 14:17:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1694355419.f8fa80bed10eacdc4269f6d8a08985a6cf6df1dc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/llvm-libunwind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/llvm-libunwind/llvm-libunwind-16.0.6-r1.ebuild sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild sys-libs/llvm-libunwind/llvm-libunwind-17.0.0.9999.ebuild sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4-r1.ebuild sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4.ebuild sys-libs/llvm-libunwind/llvm-libunwind-18.0.0.9999.ebuild sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906-r1.ebuild sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906.ebuild X-VCS-Directories: sys-libs/llvm-libunwind/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f8fa80bed10eacdc4269f6d8a08985a6cf6df1dc X-VCS-Branch: master Date: Sun, 10 Sep 2023 14:17:42 +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: bf0acbde-0c25-491c-ad85-915e56a54aff X-Archives-Hash: f830d8d7579c7c152d0ac96732f9fbdc commit: f8fa80bed10eacdc4269f6d8a08985a6cf6df1dc Author: Sam James gentoo org> AuthorDate: Sun Sep 10 14:16:03 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 10 14:16:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8fa80be sys-libs/llvm-libunwind: avoid spurious assertions with USE=-debug Respect upstream build type assumptions where they do: * -DLIBUNWIND_ENABLE_ASSERTIONS=ON => -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG * -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => -UNDEBUG See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. Bug: https://github.com/libunwind/libunwind/issues/138 Bug: https://github.com/llvm/llvm-project/issues/86 Bug: https://github.com/llvm/llvm-project/issues/55584 Closes: https://bugs.gentoo.org/910436 Signed-off-by: Sam James gentoo.org> ...m-libunwind-16.0.6.ebuild => llvm-libunwind-16.0.6-r1.ebuild} | 9 +++++++++ sys-libs/llvm-libunwind/llvm-libunwind-17.0.0.9999.ebuild | 9 +++++++++ ....0_pre20230906.ebuild => llvm-libunwind-17.0.0_rc4-r1.ebuild} | 9 +++++++++ sys-libs/llvm-libunwind/llvm-libunwind-18.0.0.9999.ebuild | 9 +++++++++ ....0_rc4.ebuild => llvm-libunwind-18.0.0_pre20230906-r1.ebuild} | 9 +++++++++ 5 files changed, 45 insertions(+) diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6-r1.ebuild similarity index 88% rename from sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild rename to sys-libs/llvm-libunwind/llvm-libunwind-16.0.6-r1.ebuild index 9d53bcd51939..18d5066e295f 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6-r1.ebuild @@ -67,6 +67,15 @@ multilib_src_configure() { local use_compiler_rt=OFF [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON + # Respect upstream build type assumptions (bug #910436) where they do: + # -DLIBUNWIND_ENABLE_ASSERTIONS=ON => + # -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG + # -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG + # -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => + # -UNDEBUG + # See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. + use debug || append-cppflags -DNDEBUG + local mycmakeargs=( -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" -DPython3_EXECUTABLE="${PYTHON}" diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0.9999.ebuild index 43f8868fc308..94ec81df1452 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0.9999.ebuild @@ -67,6 +67,15 @@ multilib_src_configure() { local use_compiler_rt=OFF [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON + # Respect upstream build type assumptions (bug #910436) where they do: + # -DLIBUNWIND_ENABLE_ASSERTIONS=ON => + # -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG + # -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG + # -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => + # -UNDEBUG + # See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. + use debug || append-cppflags -DNDEBUG + local mycmakeargs=( -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" -DPython3_EXECUTABLE="${PYTHON}" diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4-r1.ebuild similarity index 88% rename from sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906.ebuild rename to sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4-r1.ebuild index 43f8868fc308..94ec81df1452 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4-r1.ebuild @@ -67,6 +67,15 @@ multilib_src_configure() { local use_compiler_rt=OFF [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON + # Respect upstream build type assumptions (bug #910436) where they do: + # -DLIBUNWIND_ENABLE_ASSERTIONS=ON => + # -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG + # -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG + # -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => + # -UNDEBUG + # See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. + use debug || append-cppflags -DNDEBUG + local mycmakeargs=( -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" -DPython3_EXECUTABLE="${PYTHON}" diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0.9999.ebuild index 43f8868fc308..94ec81df1452 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0.9999.ebuild @@ -67,6 +67,15 @@ multilib_src_configure() { local use_compiler_rt=OFF [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON + # Respect upstream build type assumptions (bug #910436) where they do: + # -DLIBUNWIND_ENABLE_ASSERTIONS=ON => + # -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG + # -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG + # -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => + # -UNDEBUG + # See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. + use debug || append-cppflags -DNDEBUG + local mycmakeargs=( -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" -DPython3_EXECUTABLE="${PYTHON}" diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906-r1.ebuild similarity index 88% rename from sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4.ebuild rename to sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906-r1.ebuild index 43f8868fc308..94ec81df1452 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc4.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230906-r1.ebuild @@ -67,6 +67,15 @@ multilib_src_configure() { local use_compiler_rt=OFF [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON + # Respect upstream build type assumptions (bug #910436) where they do: + # -DLIBUNWIND_ENABLE_ASSERTIONS=ON => + # -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG + # -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG + # -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => + # -UNDEBUG + # See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. + use debug || append-cppflags -DNDEBUG + local mycmakeargs=( -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" -DPython3_EXECUTABLE="${PYTHON}"