commit: 6c4414fe893aea0cc1909e24be924ba50f10a537 Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Tue Sep 30 12:26:10 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=6c4414fe
dev-libs/spdlog: fix tests on multilib Closes: 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 Closes: https://github.com/gentoo/gentoo/pull/43988 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/spdlog/spdlog-1.15.1-r1.ebuild | 54 +++++++++++++++++++++++++++++++++ dev-libs/spdlog/spdlog-1.15.3-r1.ebuild | 54 +++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/dev-libs/spdlog/spdlog-1.15.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.15.1-r1.ebuild new file mode 100644 index 000000000000..19035323fc28 --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.15.1-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Fast C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog"; + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}"; +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( + >=dev-cpp/catch-3.4.0[${MULTILIB_USEDEP}] + ) +" +DEPEND=" + dev-libs/libfmt:=[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" +) + +multilib_src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +multilib_src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=yes + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/spdlog/spdlog-1.15.3-r1.ebuild b/dev-libs/spdlog/spdlog-1.15.3-r1.ebuild new file mode 100644 index 000000000000..d71a2f895c00 --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.15.3-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Fast C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog"; + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}"; +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( + >=dev-cpp/catch-3.4.0[${MULTILIB_USEDEP}] + ) +" +DEPEND=" + >=dev-libs/libfmt-11.0.2:=[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" +) + +multilib_src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +multilib_src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=yes + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +}
