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 070A6158021 for ; Sat, 26 Nov 2022 18:19:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F1FAE08C4; Sat, 26 Nov 2022 18:19:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24356E08C4 for ; Sat, 26 Nov 2022 18:19:24 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E92B3413DF for ; Sat, 26 Nov 2022 18:19:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 858BF756 for ; Sat, 26 Nov 2022 18:19:21 +0000 (UTC) From: "Sergey Torokhov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Torokhov" Message-ID: <1669486561.50af6bfa1e78a792c1d8d13658f3732bdb379805.SergeyTorokhov@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-util/fpm/fpm-0.7.0-r1.ebuild dev-util/fpm/fpm-0.7.0.ebuild X-VCS-Directories: dev-util/fpm/ X-VCS-Committer: SergeyTorokhov X-VCS-Committer-Name: Sergey Torokhov X-VCS-Revision: 50af6bfa1e78a792c1d8d13658f3732bdb379805 X-VCS-Branch: dev Date: Sat, 26 Nov 2022 18:19:21 +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: b4aab38c-6e6c-4e0e-8248-4c089752d056 X-Archives-Hash: b3404de73a033a87b0feff7677242e40 commit: 50af6bfa1e78a792c1d8d13658f3732bdb379805 Author: Sergey Torokhov yandex ru> AuthorDate: Sat Nov 26 18:16:01 2022 +0000 Commit: Sergey Torokhov yandex ru> CommitDate: Sat Nov 26 18:16:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=50af6bfa 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 yandex.ru> dev-util/fpm/{fpm-0.7.0.ebuild => fpm-0.7.0-r1.ebuild} | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 60e532ebc..de85b17db 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" \