From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Tue, 7 Jun 2016 23:43:33 +0000 (+0200)
Subject: app-office/libreoffice: Exclude clang from GCC version check
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2ed0f7a6012687058661e1cb93b51bb599719b98;p=gentoo.git

app-office/libreoffice: Exclude clang from GCC version check

Gentoo-bug: 460902

Package-Manager: portage-2.2.28
---

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