| 1 |
commit: 2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d |
| 2 |
Author: Denis Pronin <dannftk <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Mon Feb 17 12:39:09 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 17 17:58:02 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5d92de |
| 7 |
|
| 8 |
app-text/calibre: support any compiler other than gcc |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/14682 |
| 11 |
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru> |
| 12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 13 |
|
| 14 |
app-text/calibre/calibre-4.10.1-r2.ebuild | 2 +- |
| 15 |
app-text/calibre/calibre-4.9.1-r2.ebuild | 2 +- |
| 16 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-text/calibre/calibre-4.10.1-r2.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild |
| 19 |
index ff49270f891..08411595122 100644 |
| 20 |
--- a/app-text/calibre/calibre-4.10.1-r2.ebuild |
| 21 |
+++ b/app-text/calibre/calibre-4.10.1-r2.ebuild |
| 22 |
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND} |
| 23 |
virtual/pkgconfig" |
| 24 |
|
| 25 |
pkg_pretend() { |
| 26 |
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then |
| 27 |
+ if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then |
| 28 |
eerror "Calibre cannot be built with this version of gcc." |
| 29 |
eerror "You need at least gcc-6.0" |
| 30 |
die "Your C compiler is too old for this package." |
| 31 |
|
| 32 |
diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild |
| 33 |
index 9a06547f837..799b96ca85b 100644 |
| 34 |
--- a/app-text/calibre/calibre-4.9.1-r2.ebuild |
| 35 |
+++ b/app-text/calibre/calibre-4.9.1-r2.ebuild |
| 36 |
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND} |
| 37 |
virtual/pkgconfig" |
| 38 |
|
| 39 |
pkg_pretend() { |
| 40 |
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then |
| 41 |
+ if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then |
| 42 |
eerror "Calibre cannot be built with this version of gcc." |
| 43 |
eerror "You need at least gcc-6.0" |
| 44 |
die "Your C compiler is too old for this package." |
Archives