From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/volk/
Date: Thu, 3 Aug 2023 18:58:00 +0000 (UTC) [thread overview]
Message-ID: <1691089077.e357a38f91c29a5730232ff07cef4b0728dffd97.zerochaos@gentoo> (raw)
commit: e357a38f91c29a5730232ff07cef4b0728dffd97
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 3 18:56:38 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 3 18:57:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e357a38f
sci-libs/volk: fix incorrect circular deps
Also allow FEATURES="test" and don't install files which are only needed
for testing.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Fixes: https://bugs.gentoo.org/886593
.../volk/{volk-3.0.0.ebuild => volk-3.0.0-r1.ebuild} | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sci-libs/volk/volk-3.0.0.ebuild b/sci-libs/volk/volk-3.0.0-r1.ebuild
similarity index 76%
rename from sci-libs/volk/volk-3.0.0.ebuild
rename to sci-libs/volk/volk-3.0.0-r1.ebuild
index 966205b0e596..39eb8873bba8 100644
--- a/sci-libs/volk/volk-3.0.0.ebuild
+++ b/sci-libs/volk/volk-3.0.0-r1.ebuild
@@ -20,13 +20,11 @@ IUSE="orc test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- net-wireless/gnuradio
- dev-libs/boost:=
orc? ( dev-lang/orc )"
DEPEND="${RDEPEND}
$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]')"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
src_configure() {
local mycmakeargs=(
@@ -43,5 +41,17 @@ src_install() {
# Remove stray python files generated by the build system
find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+ # https://github.com/gnuradio/volk/issues/626
+ rm -f "${ED}/usr/bin/list_cpu_features"
+ rm -rf "${ED}/usr/include/cpu_features"
+ rm -rf "${ED}/usr/$(get_libdir)/cmake/CpuFeatures"
+ rm -rf "${ED}/usr/lib64/libcpu_features.a"
python_optimize
}
+
+src_test() {
+ local myctestargs=(
+ -E "(check_lgpl)"
+ )
+ cmake_src_test
+}
next reply other threads:[~2023-08-03 18:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 18:58 Rick Farina [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-08 5:23 [gentoo-commits] repo/gentoo:master commit in: sci-libs/volk/ Matt Jolly
2024-05-18 8:18 Arthur Zamarin
2024-03-30 1:35 Rick Farina
2024-01-18 2:39 Rick Farina
2024-01-18 2:39 Rick Farina
2023-10-03 17:54 Rick Farina
2023-08-19 13:34 Rick Farina
2023-07-28 18:23 Rick Farina
2023-04-06 2:18 Rick Farina
2023-02-01 19:27 Andreas Sturmlechner
2022-09-02 16:37 Rick Farina
2022-09-02 16:37 Rick Farina
2022-04-30 15:53 Marek Szuba
2021-11-01 8:29 Arthur Zamarin
2021-11-01 8:29 Arthur Zamarin
2021-06-06 1:38 Rick Farina
2021-02-11 21:21 Rick Farina
2021-01-19 3:15 Sam James
2020-12-18 19:41 Rick Farina
2020-08-14 18:19 Rick Farina
2020-06-25 16:15 Rick Farina
2020-06-08 19:26 Rick Farina
2020-06-08 16:48 Rick Farina
2020-06-08 16:48 Rick Farina
2020-06-01 20:45 Rick Farina
2020-06-01 20:45 Rick Farina
2020-06-01 20:45 Rick Farina
2020-06-01 20:45 Rick Farina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1691089077.e357a38f91c29a5730232ff07cef4b0728dffd97.zerochaos@gentoo \
--to=zerochaos@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox