From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1543317-garchives=archives.gentoo.org@lists.gentoo.org>
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 1AD1B15800A
for <garchives@archives.gentoo.org>; Thu, 3 Aug 2023 18:58:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5381EE099E;
Thu, 3 Aug 2023 18:58:03 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 36A21E099E
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Aug 2023 18:58:03 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E6003340D85
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Aug 2023 18:58:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FB4DEE9
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Aug 2023 18:58:00 +0000 (UTC)
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" <zerochaos@gentoo.org>
Message-ID: <1691089077.e357a38f91c29a5730232ff07cef4b0728dffd97.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/volk/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/volk/volk-3.0.0-r1.ebuild sci-libs/volk/volk-3.0.0.ebuild
X-VCS-Directories: sci-libs/volk/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: e357a38f91c29a5730232ff07cef4b0728dffd97
X-VCS-Branch: master
Date: Thu, 3 Aug 2023 18:58:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0be7fc76-113f-4283-a099-0734240a3d6e
X-Archives-Hash: 8e745fcd191d98916e89350883c5caca
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
+}