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

Gentoo-bug: 460902 Package-Manager: portage-2.2.28
gentoo · Jul 2, 2016 · 2ed0f7a · 2ed0f7a
1 parent d3ddc17
commit 2ed0f7a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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