From 85417dbf80d1381d17c4fe0d397594a15baeb1aa Mon Sep 17 00:00:00 2001
From: Esteve Varela Colominas <esteve.varela@gmail.com>
Date: Thu, 16 Sep 2021 03:05:18 +0200
Subject: [PATCH] sci-libs/libsigrokdecode: Pick the right python3-embed
version
Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com>
---
...3.ebuild => libsigrokdecode-0.5.3-r1.ebuild} | 17 ++++++-----------
.../libsigrokdecode/libsigrokdecode-9999.ebuild | 17 ++++++-----------
2 files changed, 12 insertions(+), 22 deletions(-)
rename sci-libs/libsigrokdecode/{libsigrokdecode-0.5.3.ebuild => libsigrokdecode-0.5.3-r1.ebuild} (67%)
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild
similarity index 67%
rename from sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
rename to sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild
index 64dcf8d7c6..f986733b6b 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild
@@ -3,12 +3,12 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-single-r1
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit python-single-r1 autotools
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
- inherit git-r3 autotools
+ inherit git-r3
else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -31,18 +31,13 @@ BDEPEND="
"
src_prepare() {
+ sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac
default
- [[ ${PV} == *9999* ]] && eautoreconf
-
- # Only a test program (not installed, and not used by src_test)
- # is used by libsigrok, so disable it to avoid the compile.
- sed -i \
- -e '/build_runtc=/s:yes:no:' \
- configure || die
+ eautoreconf
}
src_configure() {
- econf $(use_enable static-libs static)
+ econf $(use_enable static-libs static) PYTHON3="${PYTHON}"
}
src_test() {
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index a5914c1303..dc95b47328 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -3,12 +3,12 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-single-r1
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit python-single-r1 autotools
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
- inherit git-r3 autotools
+ inherit git-r3
else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -31,18 +31,13 @@ BDEPEND="
"
src_prepare() {
+ sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac
default
- [[ ${PV} == *9999* ]] && eautoreconf
-
- # Only a test program (not installed, and not used by src_test)
- # is used by libsigrok, so disable it to avoid the compile.
- sed -i \
- -e '/build_runtc=/s:yes:no:' \
- configure || die
+ eautoreconf
}
src_configure() {
- econf $(use_enable static-libs static)
+ econf $(use_enable static-libs static) PYTHON3="${PYTHON}"
}
src_test() {
--
2.32.0