From 50af6bfa1e78a792c1d8d13658f3732bdb379805 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 26 Nov 2022 21:16:01 +0300 Subject: [PATCH] dev-util/fpm: 0.7.0-r1 bump; bind to dev-libs/toml-f:0/2; enable tests The fpm-0.7.0 initially has bundled toml-f-0.2.4 and currently incompatible with toml-f-0.3.1 resulting in tests failure. Therefore the dev-libs/toml-f is subsloted and dev-util/fpm-0.7.0 depends now on dev-libs/toml-f:0/2 (i.e. 0.2.4 version). Signed-off-by: Sergey Torokhov --- .../fpm/{fpm-0.7.0.ebuild => fpm-0.7.0-r1.ebuild} | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) rename dev-util/fpm/{fpm-0.7.0.ebuild => fpm-0.7.0-r1.ebuild} (87%) diff --git a/dev-util/fpm/fpm-0.7.0.ebuild b/dev-util/fpm/fpm-0.7.0-r1.ebuild similarity index 87% rename from dev-util/fpm/fpm-0.7.0.ebuild rename to dev-util/fpm/fpm-0.7.0-r1.ebuild index 60e532ebcd..de85b17dbb 100644 --- a/dev-util/fpm/fpm-0.7.0.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r1.ebuild @@ -19,11 +19,11 @@ SRC_URI=" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="openmp doc" -RESTRICT="test" +IUSE="openmp doc test" +RESTRICT="!test? ( test )" CDEPEND=" - dev-libs/toml-f + dev-libs/toml-f:0/2 dev-libs/m_cli2 " @@ -99,6 +99,13 @@ src_compile() { fi } +src_test() { + "${BSDIR}"/fpm test --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ + --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" +} + src_install() { # Set prefix and pass all used env flags to avoid recompiling with default values "${BSDIR}"/fpm install --prefix "${ED}/usr" \