diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
| commit | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (patch) | |
| tree | 3ee550255947da075650f1a551dcc278f9a1b7f8 /eclass | |
| parent | a978c074e4272bb901fbe4a10de0a7b2af574f17 (diff) | |
gentoo resync : 07.05.2021
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36483 -> 36485 bytes | |||
| -rw-r--r-- | eclass/meson.eclass | 7 | ||||
| -rw-r--r-- | eclass/rust-toolchain.eclass | 1 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 14 |
4 files changed, 21 insertions, 1 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 5512bba5e4dc..c8f911088882 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/meson.eclass b/eclass/meson.eclass index d0ce5adb3558..d87d61f44ae4 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -1,4 +1,4 @@ -# Copyright 2017-2020 Gentoo Authors +# Copyright 2017-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: meson.eclass @@ -142,6 +142,11 @@ _meson_get_machine_info() { case ${cpu_family} in amd64) cpu_family=x86_64 ;; arm64) cpu_family=aarch64 ;; + riscv) + case ${tuple} in + riscv32*) cpu_family=riscv32 ;; + riscv64*) cpu_family=riscv64 ;; + esac ;; esac # This may require adjustment based on CFLAGS diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 35e13e3de97b..3301b5f32fe2 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -89,6 +89,7 @@ rust_arch_uri() { echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> ${3}-${1}.tar.xz" else echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz" + echo "verify-sig? ( ${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz.asc )" fi } diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index eb8223ec6ac0..85a6a53654d3 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -129,6 +129,20 @@ fi test_var PYTHON_PKG_DEP python3_9 '*dev-lang/python*:3.9' test_var PYTHON_SCRIPTDIR python3_9 /usr/lib/python-exec/python3.9 +test_var EPYTHON python3_10 python3.10 +test_var PYTHON python3_10 /usr/bin/python3.10 +if [[ -x /usr/bin/python3.10 ]]; then + abiflags=$(/usr/bin/python3.10 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))') + test_var PYTHON_SITEDIR python3_10 "/usr/lib/python3.10/site-packages" + test_var PYTHON_INCLUDEDIR python3_10 "/usr/include/python3.10${abiflags}" + test_var PYTHON_LIBPATH python3_10 "/usr/lib*/libpython3.10${abiflags}$(get_libname)" + test_var PYTHON_CONFIG python3_10 "/usr/bin/python3.10${abiflags}-config" + test_var PYTHON_CFLAGS python3_10 "*-I/usr/include/python3.10*" + test_var PYTHON_LIBS python3_10 "*-lpython3.10*" +fi +test_var PYTHON_PKG_DEP python3_10 '*dev-lang/python*:3.10' +test_var PYTHON_SCRIPTDIR python3_10 /usr/lib/python-exec/python3.10 + test_var EPYTHON pypy3 pypy3 test_var PYTHON pypy3 /usr/bin/pypy3 if [[ -x /usr/bin/pypy3 ]]; then |