1 |
commit: 34ccc1d848c74a17edebc48f0c0c936106ffa278 |
2 |
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> |
3 |
AuthorDate: Wed Sep 14 20:31:05 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 15 12:48:23 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ccc1d8 |
7 |
|
8 |
sys-process/btop: Hard-depend on sys-devel/gcc |
9 |
|
10 |
Clang currently does not have support for the C++ 20 ranges library, |
11 |
causing build failures wis sys-process/btop. The only compiler supported |
12 |
upstream is sys-devel/gcc [0]. This commit enforces g++ to be used as a |
13 |
compiler until proper clang support is available. |
14 |
|
15 |
[0] https://github.com/aristocratos/btop/issues/324 |
16 |
|
17 |
Closes: https://bugs.gentoo.org/839318 |
18 |
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de> |
19 |
Closes: https://github.com/gentoo/gentoo/pull/27255 |
20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
21 |
|
22 |
sys-process/btop/btop-1.2.8.ebuild | 13 +++++++++++++ |
23 |
sys-process/btop/btop-1.2.9.ebuild | 13 +++++++++++++ |
24 |
2 files changed, 26 insertions(+) |
25 |
|
26 |
diff --git a/sys-process/btop/btop-1.2.8.ebuild b/sys-process/btop/btop-1.2.8.ebuild |
27 |
index b4ac52c9fecc..ee0bbdefbd6d 100644 |
28 |
--- a/sys-process/btop/btop-1.2.8.ebuild |
29 |
+++ b/sys-process/btop/btop-1.2.8.ebuild |
30 |
@@ -13,6 +13,19 @@ LICENSE="Apache-2.0" |
31 |
SLOT="0" |
32 |
KEYWORDS="amd64 arm64 ppc64 ~riscv x86" |
33 |
|
34 |
+BDEPEND=" |
35 |
+ >=sys-devel/gcc-8 |
36 |
+" |
37 |
+ |
38 |
+pkg_setup() { |
39 |
+ if [[ "${MERGE_TYPE}" != "binary" ]]; then |
40 |
+ if ! tc-is-gcc ; then |
41 |
+ # https://bugs.gentoo.org/839318 |
42 |
+ die "$(tc-getCXX) is not a supported compiler. Please use sys-devel/gcc instead." |
43 |
+ fi |
44 |
+ fi |
45 |
+} |
46 |
+ |
47 |
src_prepare() { |
48 |
default |
49 |
# btop installs README.md to /usr/share/btop by default |
50 |
|
51 |
diff --git a/sys-process/btop/btop-1.2.9.ebuild b/sys-process/btop/btop-1.2.9.ebuild |
52 |
index 53e5416f327e..6bf13cbd7d95 100644 |
53 |
--- a/sys-process/btop/btop-1.2.9.ebuild |
54 |
+++ b/sys-process/btop/btop-1.2.9.ebuild |
55 |
@@ -13,6 +13,19 @@ LICENSE="Apache-2.0" |
56 |
SLOT="0" |
57 |
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" |
58 |
|
59 |
+BDEPEND=" |
60 |
+ >=sys-devel/gcc-8 |
61 |
+" |
62 |
+ |
63 |
+pkg_setup() { |
64 |
+ if [[ "${MERGE_TYPE}" != "binary" ]]; then |
65 |
+ if ! tc-is-gcc ; then |
66 |
+ # https://bugs.gentoo.org/839318 |
67 |
+ die "$(tc-getCXX) is not a supported compiler. Please use sys-devel/gcc instead." |
68 |
+ fi |
69 |
+ fi |
70 |
+} |
71 |
+ |
72 |
src_prepare() { |
73 |
default |
74 |
# btop installs README.md to /usr/share/btop by default |