Gentoo Archives: gentoo-commits

From: Thomas Beierlein <tomjbe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/, net-wireless/gr-osmosdr/files/
Date: Mon, 29 Aug 2022 12:08:09
Message-Id: 1661774609.3bf04c51cb976faec35dbecdbb99a544b9d2282c.tomjbe@gentoo
1 commit: 3bf04c51cb976faec35dbecdbb99a544b9d2282c
2 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 29 12:02:58 2022 +0000
4 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 29 12:03:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf04c51
7
8 net-wireless/gr-osmosdr: Fix build without python bindings
9
10 Closes: https://bugs.gentoo.org/865807
11 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
12
13 .../gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch | 15 +++++++++++++++
14 net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild | 6 +++++-
15 2 files changed, 20 insertions(+), 1 deletion(-)
16
17 diff --git a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch
18 new file mode 100644
19 index 000000000000..2bf79b1fe20e
20 --- /dev/null
21 +++ b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch
22 @@ -0,0 +1,15 @@
23 +diff --git a/CMakeLists.txt b/CMakeLists.txt
24 +index 96a2c90..a3836f8 100644
25 +--- a/CMakeLists.txt
26 ++++ b/CMakeLists.txt
27 +@@ -187,9 +187,7 @@ find_package(Doxygen)
28 +
29 + # Python
30 + ##########
31 +-
32 +-find_package(PythonLibs 3)
33 +-find_package(pybind11)
34 ++include(GrPybind)
35 +
36 + GR_REGISTER_COMPONENT("Python support" ENABLE_PYTHON
37 + PYTHONLIBS_FOUND
38
39 diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
40 index 518b27caa2a1..a481ca03c6f3 100644
41 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
42 +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
43 @@ -44,6 +44,10 @@ DEPEND="${RDEPEND}
44
45 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
46
47 +PATCHES=(
48 + "${FILESDIR}"/${P}-fix-enable-python.patch
49 +)
50 +
51 src_configure() {
52 local mycmakeargs=(
53 -DENABLE_DEFAULT=OFF
54 @@ -69,7 +73,7 @@ src_configure() {
55 src_install() {
56 cmake_src_install
57 if use python; then
58 - find "${D}" -name '*.py[oc]' -delete || die
59 + find "${ED}" -name '*.py[oc]' -delete || die
60 python_fix_shebang "${ED}"/usr/bin
61 python_optimize
62 fi