summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-06-08 01:43:33 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2016-07-02 23:15:52 +0200
commit2ed0f7a6012687058661e1cb93b51bb599719b98 (patch)
tree369654b91aaa814c729f9d44a7adc49cb4fb01d2 /app-office
parentapp-office/libreoffice: Drop EXT_URI and old comment (diff)
downloadgentoo-2ed0f7a6012687058661e1cb93b51bb599719b98.tar.gz
gentoo-2ed0f7a6012687058661e1cb93b51bb599719b98.tar.bz2
gentoo-2ed0f7a6012687058661e1cb93b51bb599719b98.zip
app-office/libreoffice: Exclude clang from GCC version check
Gentoo-bug: 460902 Package-Manager: portage-2.2.28
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/libreoffice-5.1.9999.ebuild7
-rw-r--r--app-office/libreoffice/libreoffice-5.2.9999.ebuild7
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild7
3 files changed, 12 insertions, 9 deletions
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 26d120920084..5320fe3d0797 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -260,9 +260,10 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 4792129f3a2b..9b090c026610 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -258,9 +258,10 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4792129f3a2b..9b090c026610 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -258,9 +258,10 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi