| 1 |
commit: 2ed0f7a6012687058661e1cb93b51bb599719b98 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jun 7 23:43:33 2016 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 2 21:15:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed0f7a6 |
| 7 |
|
| 8 |
app-office/libreoffice: Exclude clang from GCC version check |
| 9 |
|
| 10 |
Gentoo-bug: 460902 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 7 ++++--- |
| 15 |
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 7 ++++--- |
| 16 |
app-office/libreoffice/libreoffice-9999.ebuild | 7 ++++--- |
| 17 |
3 files changed, 12 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
| 20 |
index 26d1209..5320fe3 100644 |
| 21 |
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
| 22 |
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
| 23 |
@@ -260,9 +260,10 @@ pkg_pretend() { |
| 24 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 25 |
check-reqs_pkg_pretend |
| 26 |
|
| 27 |
- if [[ $(gcc-major-version) -lt 4 ]] || { |
| 28 |
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } |
| 29 |
- then |
| 30 |
+ if [[ $(tc-getCC) == clang ]] ; then |
| 31 |
+ : # ignore clang, which works |
| 32 |
+ elif [[ $(gcc-major-version) -lt 4 ]] || { |
| 33 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then |
| 34 |
eerror "Compilation with gcc older than 4.7 is not supported" |
| 35 |
die "Too old gcc found." |
| 36 |
fi |
| 37 |
|
| 38 |
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
| 39 |
index 4792129..9b090c0 100644 |
| 40 |
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
| 41 |
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
| 42 |
@@ -258,9 +258,10 @@ pkg_pretend() { |
| 43 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 44 |
check-reqs_pkg_pretend |
| 45 |
|
| 46 |
- if [[ $(gcc-major-version) -lt 4 ]] || { |
| 47 |
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } |
| 48 |
- then |
| 49 |
+ if [[ $(tc-getCC) == clang ]] ; then |
| 50 |
+ : # ignore clang, which works |
| 51 |
+ elif [[ $(gcc-major-version) -lt 4 ]] || { |
| 52 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then |
| 53 |
eerror "Compilation with gcc older than 4.7 is not supported" |
| 54 |
die "Too old gcc found." |
| 55 |
fi |
| 56 |
|
| 57 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 58 |
index 4792129..9b090c0 100644 |
| 59 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 60 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 61 |
@@ -258,9 +258,10 @@ pkg_pretend() { |
| 62 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 63 |
check-reqs_pkg_pretend |
| 64 |
|
| 65 |
- if [[ $(gcc-major-version) -lt 4 ]] || { |
| 66 |
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } |
| 67 |
- then |
| 68 |
+ if [[ $(tc-getCC) == clang ]] ; then |
| 69 |
+ : # ignore clang, which works |
| 70 |
+ elif [[ $(gcc-major-version) -lt 4 ]] || { |
| 71 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then |
| 72 |
eerror "Compilation with gcc older than 4.7 is not supported" |
| 73 |
die "Too old gcc found." |
| 74 |
fi |
Archives