1 |
commit: 25a827843a88cb85bd35493049d4b59f426fc0e0 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 31 18:36:34 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 31 20:42:05 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a82784 |
7 |
|
8 |
toolchain.eclass: simplify LICENSE= by leaving >=gcc-4.6 case |
9 |
|
10 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
11 |
|
12 |
eclass/toolchain.eclass | 15 +-------------- |
13 |
1 file changed, 1 insertion(+), 14 deletions(-) |
14 |
|
15 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
16 |
index 78f805f7454..104fc541d90 100644 |
17 |
--- a/eclass/toolchain.eclass |
18 |
+++ b/eclass/toolchain.eclass |
19 |
@@ -117,20 +117,7 @@ STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VE |
20 |
|
21 |
#---->> LICENSE+SLOT+IUSE logic <<---- |
22 |
|
23 |
-if tc_version_is_at_least 4.6 ; then |
24 |
- LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+" |
25 |
-elif tc_version_is_at_least 4.4 ; then |
26 |
- LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+" |
27 |
-elif tc_version_is_at_least 4.3 ; then |
28 |
- LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+" |
29 |
-elif tc_version_is_at_least 4.2 ; then |
30 |
- LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+" |
31 |
-elif tc_version_is_at_least 3.3 ; then |
32 |
- LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+" |
33 |
-else |
34 |
- LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" |
35 |
-fi |
36 |
- |
37 |
+LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+" |
38 |
IUSE="test vanilla +nls" |
39 |
RESTRICT="!test? ( test )" |