summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Pronin <dannftk@yandex.ru>2020-02-17 15:39:09 +0300
committerZac Medico <zmedico@gentoo.org>2020-02-17 09:58:02 -0800
commit2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d (patch)
tree53250a17358f4b5a662485fd0a9ab9f4f0b377d5 /app-text
parentsys-kernel/pf-sources: bump to 5.5-pf4 (diff)
downloadgentoo-2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d.tar.gz
gentoo-2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d.tar.bz2
gentoo-2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d.zip
app-text/calibre: support any compiler other than gcc
Closes: https://github.com/gentoo/gentoo/pull/14682 Signed-off-by: Denis Pronin <dannftk@yandex.ru> Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'app-text')
-rw-r--r--app-text/calibre/calibre-4.10.1-r2.ebuild2
-rw-r--r--app-text/calibre/calibre-4.9.1-r2.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/app-text/calibre/calibre-4.10.1-r2.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild
index ff49270f8916..08411595122f 100644
--- a/app-text/calibre/calibre-4.10.1-r2.ebuild
+++ b/app-text/calibre/calibre-4.10.1-r2.ebuild
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+ if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
eerror "Calibre cannot be built with this version of gcc."
eerror "You need at least gcc-6.0"
die "Your C compiler is too old for this package."
diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild
index 9a06547f837d..799b96ca85b2 100644
--- a/app-text/calibre/calibre-4.9.1-r2.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r2.ebuild
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+ if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
eerror "Calibre cannot be built with this version of gcc."
eerror "You need at least gcc-6.0"
die "Your C compiler is too old for this package."