| 1 |
commit: 5a576e626fb9459377ad3628f780b47ab2888158 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 2 21:44:56 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 2 21:44:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=5a576e62 |
| 7 |
|
| 8 |
profiles: Rework so we only use python-3.7 (no patches needed there) |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/arch/riscv/package.accept_keywords | 1 - |
| 13 |
profiles/arch/riscv/rv64gc/make.defaults | 4 ++++ |
| 14 |
profiles/arch/riscv/{ => rv64gc}/package.mask | 2 +- |
| 15 |
profiles/arch/riscv/rv64gc/use.mask | 8 ++++++++ |
| 16 |
profiles/arch/riscv/use.mask | 3 --- |
| 17 |
5 files changed, 13 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords |
| 20 |
index 41b16e7..dc5941f 100644 |
| 21 |
--- a/profiles/arch/riscv/package.accept_keywords |
| 22 |
+++ b/profiles/arch/riscv/package.accept_keywords |
| 23 |
@@ -1,5 +1,4 @@ |
| 24 |
# we need specific versions / patches for riscv |
| 25 |
-dev-lang/python -amd64 -~amd64 |
| 26 |
sys-devel/gcc -amd64 -~amd64 |
| 27 |
sys-libs/glibc -amd64 -~amd64 |
| 28 |
|
| 29 |
|
| 30 |
diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults |
| 31 |
index 43de775..0d78820 100644 |
| 32 |
--- a/profiles/arch/riscv/rv64gc/make.defaults |
| 33 |
+++ b/profiles/arch/riscv/rv64gc/make.defaults |
| 34 |
@@ -36,3 +36,7 @@ USE_EXPAND_HIDDEN="-ABI_RISCV" |
| 35 |
|
| 36 |
# Implicitly enable lp64d in ebuilds without multilib support |
| 37 |
IUSE_IMPLICIT="abi_riscv_lp64d" |
| 38 |
+ |
| 39 |
+# Enable Python 3.7 (and potentially later versions) only |
| 40 |
+PYTHON_TARGETS="python3_7" |
| 41 |
+PYTHON_SINGLE_TARGET="python3_7" |
| 42 |
|
| 43 |
diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/rv64gc/package.mask |
| 44 |
similarity index 70% |
| 45 |
rename from profiles/arch/riscv/package.mask |
| 46 |
rename to profiles/arch/riscv/rv64gc/package.mask |
| 47 |
index 887eef2..e351251 100644 |
| 48 |
--- a/profiles/arch/riscv/package.mask |
| 49 |
+++ b/profiles/arch/riscv/rv64gc/package.mask |
| 50 |
@@ -1,2 +1,2 @@ |
| 51 |
# Doesnt work properly with the two-level libdirs |
| 52 |
-dev-lang/python:2.7 |
| 53 |
+<dev-lang/python-3.7 |
| 54 |
|
| 55 |
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask |
| 56 |
index cf1e9a0..f7180f2 100644 |
| 57 |
--- a/profiles/arch/riscv/rv64gc/use.mask |
| 58 |
+++ b/profiles/arch/riscv/rv64gc/use.mask |
| 59 |
@@ -1,3 +1,11 @@ |
| 60 |
+# Copyright 2019 Gentoo Authors |
| 61 |
+# Distributed under the terms of the GNU General Public License v2 |
| 62 |
+ |
| 63 |
# Unmask the multilib flags for this arch. |
| 64 |
-abi_riscv_lp64d |
| 65 |
-abi_riscv_lp64 |
| 66 |
+ |
| 67 |
+# Our Python has a lot of trouble with the two-level libdir. |
| 68 |
+python_targets_python2_7 |
| 69 |
+python_targets_python3_5 |
| 70 |
+python_targets_python3_6 |
| 71 |
|
| 72 |
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask |
| 73 |
index d974bbe..7e3b454 100644 |
| 74 |
--- a/profiles/arch/riscv/use.mask |
| 75 |
+++ b/profiles/arch/riscv/use.mask |
| 76 |
@@ -6,6 +6,3 @@ |
| 77 |
|
| 78 |
# The required library has not been ported to riscv yet. |
| 79 |
seccomp |
| 80 |
- |
| 81 |
-# Python 2 has a lot of trouble with the two-level libdir. |
| 82 |
-python_targets_python2_7 |
Archives