bircoph 15/07/16 21:22:10
Modified: root-6.02.05-r2.ebuild ChangeLog
root-5.34.26.ebuild root-5.34.28-r1.ebuild
Log:
Fix compiler version check for ICC and Clang
Signed-off-by: Andrew Savchenko <[email protected]>
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
565953B95372756C)
Revision Changes Path
1.5 sci-physics/root/root-6.02.05-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild?r1=1.4&r2=1.5
Index: root-6.02.05-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- root-6.02.05-r2.ebuild 15 May 2015 20:23:37 -0000 1.4
+++ root-6.02.05-r2.ebuild 16 Jul 2015 21:22:10 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v
1.4 2015/05/15 20:23:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v
1.5 2015/07/16 21:22:10 bircoph Exp $
EAPI=5
@@ -118,7 +118,7 @@
OC_UNSUPPORTED="6.8.0"
die_compiler() {
- eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+ eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
die "Need one of the following C++$1 capable compilers:\n"\
" >=sys-devel/gcc[cxx]-$2\n"\
" >=sys-devel/clang-$3\n"\
@@ -131,23 +131,26 @@
# $3 - clang++
# $4 - icc/icpc
check_compiler() {
+ local ver
case "$(tc-getCXX)" in
*clang++*)
- version_is_at_least "$3" "$(has_version
sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+ ver="$(best_version sys-devel/clang | sed
's:sys-devel/clang-::')"
;;
*g++*)
- version_is_at_least "$2" "$(gcc-version)" ||
die_compiler "$1" "$2" "$3" "$4"
+ ver="$(gcc-version)"
;;
*icc*|*icpc*)
- version_is_at_least "$4" "$(has_version dev-lang/icc)"
|| die_compiler "$1" "$2" "$3" "$4"
+ ver="$(best_version dev-lang/icc | sed
's:dev-lang/icc-::')"
eerror "ROOT-6 is known not to build with ICC."
eerror "Please report any isuses upstream."
;;
*)
ewarn "You are using an unsupported compiler."
ewarn "Please report any issues upstream."
+ return 0
;;
esac
+ version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4"
"${ver}"
}
pkg_setup() {
1.148 sci-physics/root/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.148&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.148&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?r1=1.147&r2=1.148
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- ChangeLog 15 May 2015 20:23:37 -0000 1.147
+++ ChangeLog 16 Jul 2015 21:22:10 -0000 1.148
@@ -1,6 +1,11 @@
# ChangeLog for sci-physics/root
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.147
2015/05/15 20:23:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.148
2015/07/16 21:22:10 bircoph Exp $
+
+ 16 Jul 2015; Andrew Savchenko <[email protected]> root-5.34.26.ebuild,
+ root-5.34.28-r1.ebuild, root-6.02.05-r2.ebuild:
+ Fix compiler version check for ICC and Clang. Reported by Dmitry
+ Kustov, [email protected].
15 May 2015; Andrew Savchenko <[email protected]> root-6.02.05-r2.ebuild,
-files/root-6.02.05-dictpch.patch:
1.5 sci-physics/root/root-5.34.26.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?r1=1.4&r2=1.5
Index: root-5.34.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- root-5.34.26.ebuild 1 May 2015 15:30:02 -0000 1.4
+++ root-5.34.26.ebuild 16 Jul 2015 21:22:10 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.4
2015/05/01 15:30:02 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.5
2015/07/16 21:22:10 bircoph Exp $
EAPI=5
@@ -120,7 +120,7 @@
DOC_DIR="/usr/share/doc/${P}"
die_compiler() {
- eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+ eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
die "Need one of the following C++$1 capable compilers:\n"\
" >=sys-devel/gcc[cxx]-$2\n"\
" >=sys-devel/clang-$3\n"\
@@ -133,21 +133,24 @@
# $3 - clang++
# $4 - icc/icpc
check_compiler() {
+ local ver
case "$(tc-getCXX)" in
*clang++*)
- version_is_at_least "$3" "$(has_version
sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+ ver="$(best_version sys-devel/clang | sed
's:sys-devel/clang-::')"
;;
*g++*)
- version_is_at_least "$2" "$(gcc-version)" ||
die_compiler "$1" "$2" "$3" "$4"
+ ver="$(gcc-version)"
;;
*icc*|*icpc*)
- version_is_at_least "$4" "$(has_version dev-lang/icc)"
|| die_compiler "$1" "$2" "$3" "$4"
+ ver="$(best_version dev-lang/icc | sed
's:dev-lang/icc-::')"
;;
*)
ewarn "You are using an unsupported compiler."
ewarn "Please report any issues upstream."
+ return 0
;;
esac
+ version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4"
"${ver}"
}
pkg_setup() {
1.2 sci-physics/root/root-5.34.28-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?r1=1.1&r2=1.2
Index: root-5.34.28-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- root-5.34.28-r1.ebuild 12 Apr 2015 22:24:42 -0000 1.1
+++ root-5.34.28-r1.ebuild 16 Jul 2015 21:22:10 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v
1.1 2015/04/12 22:24:42 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v
1.2 2015/07/16 21:22:10 bircoph Exp $
EAPI=5
@@ -114,7 +114,7 @@
DOC_DIR="/usr/share/doc/${P}"
die_compiler() {
- eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+ eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
die "Need one of the following C++$1 capable compilers:\n"\
" >=sys-devel/gcc[cxx]-$2\n"\
" >=sys-devel/clang-$3\n"\
@@ -127,21 +127,24 @@
# $3 - clang++
# $4 - icc/icpc
check_compiler() {
+ local ver
case "$(tc-getCXX)" in
*clang++*)
- version_is_at_least "$3" "$(has_version
sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+ ver="$(best_version sys-devel/clang | sed
's:sys-devel/clang-::')"
;;
*g++*)
- version_is_at_least "$2" "$(gcc-version)" ||
die_compiler "$1" "$2" "$3" "$4"
+ ver="$(gcc-version)"
;;
*icc*|*icpc*)
- version_is_at_least "$4" "$(has_version dev-lang/icc)"
|| die_compiler "$1" "$2" "$3" "$4"
+ ver="$(best_version dev-lang/icc | sed
's:dev-lang/icc-::')"
;;
*)
ewarn "You are using an unsupported compiler."
ewarn "Please report any issues upstream."
+ return 0
;;
esac
+ version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4"
"${ver}"
}
pkg_setup() {
