commit: 4f41ed0683937fe39ab475f367642e107b9e340d Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Tue Sep 30 12:16:13 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 22:02:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f41ed06
dev-cpp/catch add multilib support * This fix compile error on package with multilib support, such as spdlog, and require catch as dependency. Bug: https://bugs.gentoo.org/962994 Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43988 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{catch-1.9999.ebuild => catch-1.12.2-r3.ebuild} | 14 +++++++++----- dev-cpp/catch/catch-1.9999.ebuild | 8 ++++---- .../catch/{catch-9999.ebuild => catch-2.13.10-r1.ebuild} | 16 +++++++--------- .../catch/{catch-9999.ebuild => catch-3.8.1-r1.ebuild} | 8 ++++---- dev-cpp/catch/catch-9999.ebuild | 4 ++-- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.12.2-r3.ebuild similarity index 72% copy from dev-cpp/catch/catch-1.9999.ebuild copy to dev-cpp/catch/catch-1.12.2-r3.ebuild index 479fa612486c..8ac51fa046ae 100644 --- a/dev-cpp/catch/catch-1.9999.ebuild +++ b/dev-cpp/catch/catch-1.12.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake-multilib if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then else MY_P=${PN^}-${PV} SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" S="${WORKDIR}/${PN^}2-${PV}" fi @@ -25,14 +25,18 @@ SLOT="1" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +PATCHES=( + "${FILESDIR}"/${PN}-1.12.2-glibc-2.34-sigstksz.patch +) + +multilib_src_configure() { local mycmakeargs=( -DNO_SELFTEST=$(usex !test) ) cmake_src_configure } -src_install() { +multilib_src_install() { cmake_src_install dodoc -r docs/. } diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild index 479fa612486c..0c9994428a6d 100644 --- a/dev-cpp/catch/catch-1.9999.ebuild +++ b/dev-cpp/catch/catch-1.9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake-multilib if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -25,14 +25,14 @@ SLOT="1" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DNO_SELFTEST=$(usex !test) ) cmake_src_configure } -src_install() { +multilib_src_install() { cmake_src_install dodoc -r docs/. } diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-2.13.10-r1.ebuild similarity index 69% copy from dev-cpp/catch/catch-9999.ebuild copy to dev-cpp/catch/catch-2.13.10-r1.ebuild index 4c007ac4dc5f..31ec3aa215f9 100644 --- a/dev-cpp/catch/catch-9999.ebuild +++ b/dev-cpp/catch/catch-2.13.10-r1.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{10..14} ) -inherit cmake python-any-r1 +inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -15,7 +15,7 @@ else SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Modern C++ header-only framework for unit-tests" @@ -32,15 +32,13 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_configure() { +multilib_src_configure() { local mycmakeargs=( - -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_ENABLE_WERROR=OFF - -DCATCH_BUILD_TESTING=$(usex test) - ) - use test && mycmakeargs+=( - -DPYTHON_EXECUTABLE="${PYTHON}" + -DBUILD_TESTING=$(usex test) ) + use test && + mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" ) cmake_src_configure } diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-3.8.1-r1.ebuild similarity index 81% copy from dev-cpp/catch/catch-9999.ebuild copy to dev-cpp/catch/catch-3.8.1-r1.ebuild index 4c007ac4dc5f..c661cf051f3b 100644 --- a/dev-cpp/catch/catch-9999.ebuild +++ b/dev-cpp/catch/catch-3.8.1-r1.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{10..14} ) -inherit cmake python-any-r1 +inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -15,7 +15,7 @@ else SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Modern C++ header-only framework for unit-tests" @@ -32,7 +32,7 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_ENABLE_WERROR=OFF diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild index 4c007ac4dc5f..ab1969170173 100644 --- a/dev-cpp/catch/catch-9999.ebuild +++ b/dev-cpp/catch/catch-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake python-any-r1 +inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -32,7 +32,7 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_ENABLE_WERROR=OFF
