| 1 |
commit: 7e4731691bf7d76ad6530951e10fb3954e16c9d8 |
| 2 |
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Sep 16 01:05:18 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 16 01:25:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e473169 |
| 7 |
|
| 8 |
sci-libs/libsigrokdecode: Pick the right python3-embed version |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/794592 |
| 11 |
Closes: https://bugs.gentoo.org/799614 |
| 12 |
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
...-0.5.3.ebuild => libsigrokdecode-0.5.3-r1.ebuild} | 20 +++++++++----------- |
| 16 |
sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild | 18 ++++++++---------- |
| 17 |
2 files changed, 17 insertions(+), 21 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild |
| 20 |
similarity index 64% |
| 21 |
rename from sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild |
| 22 |
rename to sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild |
| 23 |
index 64dcf8d7c68..94adf3d75fe 100644 |
| 24 |
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild |
| 25 |
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild |
| 26 |
@@ -1,14 +1,14 @@ |
| 27 |
-# Copyright 1999-2020 Gentoo Authors |
| 28 |
+# Copyright 1999-2021 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
|
| 33 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 34 |
-inherit python-single-r1 |
| 35 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
| 36 |
+inherit autotools python-single-r1 |
| 37 |
|
| 38 |
if [[ ${PV} == *9999* ]]; then |
| 39 |
EGIT_REPO_URI="git://sigrok.org/${PN}" |
| 40 |
- inherit git-r3 autotools |
| 41 |
+ inherit git-r3 |
| 42 |
else |
| 43 |
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" |
| 44 |
KEYWORDS="~amd64 ~x86" |
| 45 |
@@ -32,17 +32,15 @@ BDEPEND=" |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
default |
| 49 |
- [[ ${PV} == *9999* ]] && eautoreconf |
| 50 |
|
| 51 |
- # Only a test program (not installed, and not used by src_test) |
| 52 |
- # is used by libsigrok, so disable it to avoid the compile. |
| 53 |
- sed -i \ |
| 54 |
- -e '/build_runtc=/s:yes:no:' \ |
| 55 |
- configure || die |
| 56 |
+ # bug #794592 |
| 57 |
+ sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die |
| 58 |
+ |
| 59 |
+ eautoreconf |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
- econf $(use_enable static-libs static) |
| 64 |
+ econf $(use_enable static-libs static) PYTHON3="${PYTHON}" |
| 65 |
} |
| 66 |
|
| 67 |
src_test() { |
| 68 |
|
| 69 |
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild |
| 70 |
index a5914c13031..71b414a4c1a 100644 |
| 71 |
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild |
| 72 |
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild |
| 73 |
@@ -3,12 +3,12 @@ |
| 74 |
|
| 75 |
EAPI=7 |
| 76 |
|
| 77 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 78 |
-inherit python-single-r1 |
| 79 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
| 80 |
+inherit autotools python-single-r1 |
| 81 |
|
| 82 |
if [[ ${PV} == *9999* ]]; then |
| 83 |
EGIT_REPO_URI="git://sigrok.org/${PN}" |
| 84 |
- inherit git-r3 autotools |
| 85 |
+ inherit git-r3 |
| 86 |
else |
| 87 |
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" |
| 88 |
KEYWORDS="~amd64 ~x86" |
| 89 |
@@ -32,17 +32,15 @@ BDEPEND=" |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
default |
| 93 |
- [[ ${PV} == *9999* ]] && eautoreconf |
| 94 |
|
| 95 |
- # Only a test program (not installed, and not used by src_test) |
| 96 |
- # is used by libsigrok, so disable it to avoid the compile. |
| 97 |
- sed -i \ |
| 98 |
- -e '/build_runtc=/s:yes:no:' \ |
| 99 |
- configure || die |
| 100 |
+ # bug #794592 |
| 101 |
+ sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die |
| 102 |
+ |
| 103 |
+ eautoreconf |
| 104 |
} |
| 105 |
|
| 106 |
src_configure() { |
| 107 |
- econf $(use_enable static-libs static) |
| 108 |
+ econf $(use_enable static-libs static) PYTHON3="${PYTHON}" |
| 109 |
} |
| 110 |
|
| 111 |
src_test() { |
Archives