From: Andreas K. Hüttel Date: Mon, 19 Dec 2016 22:08:39 +0000 (+0100) Subject: app-office/libreoffice: Fix clang check, bug 601504 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a694b5574557dacd48aa87c7eea4f232a74116e;p=gentoo.git app-office/libreoffice: Fix clang check, bug 601504 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- diff --git a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild index 1202118d53ce..76e383a195f9 100644 --- a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild @@ -261,7 +261,7 @@ pkg_pretend() { fi check-reqs_pkg_pretend - if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && { [[ $(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." diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild index 1202118d53ce..76e383a195f9 100644 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild @@ -261,7 +261,7 @@ pkg_pretend() { fi check-reqs_pkg_pretend - if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && { [[ $(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." diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild index 732c9634f10e..f1761bea7426 100644 --- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild @@ -260,7 +260,7 @@ pkg_pretend() { fi check-reqs_pkg_pretend - if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && { [[ $(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." diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index c9bad32b055e..af0a7dc0e77e 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -260,7 +260,7 @@ pkg_pretend() { fi check-reqs_pkg_pretend - if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && { [[ $(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."