From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- profiles/arch/amd64/no-multilib/package.mask | 1 + profiles/arch/amd64/package.use.mask | 4 +++ profiles/arch/amd64/package.use.stable.mask | 5 +-- profiles/arch/arm/armv4/package.mask | 1 + profiles/arch/arm/armv4t/package.mask | 1 + profiles/arch/arm/armv5te/package.mask | 1 + profiles/arch/arm/make.defaults | 1 - profiles/arch/arm/package.use.mask | 9 +++++ profiles/arch/arm64/package.use.mask | 7 +++- profiles/arch/base/package.use.mask | 4 +++ profiles/arch/base/use.mask | 2 ++ profiles/arch/hppa/make.defaults | 4 +++ profiles/arch/hppa/package.use.mask | 2 +- profiles/arch/hppa/use.stable.mask | 4 +++ profiles/arch/powerpc/ppc64/64le/package.mask | 1 + profiles/arch/powerpc/ppc64/package.mask | 1 + profiles/arch/riscv/make.defaults | 39 +++++++++++++++++----- profiles/arch/riscv/package.mask | 5 +++ profiles/arch/riscv/package.use.mask | 14 +++++++- profiles/arch/riscv/rv32imac/eapi | 1 + profiles/arch/riscv/rv32imac/ilp32/eapi | 1 + profiles/arch/riscv/rv32imac/ilp32/make.defaults | 12 +++++++ .../arch/riscv/rv32imac/ilp32/package.use.force | 5 +++ profiles/arch/riscv/rv32imac/ilp32/use.force | 5 +++ profiles/arch/riscv/rv32imac/ilp32/use.mask | 10 ++++++ profiles/arch/riscv/rv32imac/ilp32d/eapi | 1 + profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 15 +++++++++ .../arch/riscv/rv32imac/ilp32d/package.use.force | 5 +++ profiles/arch/riscv/rv32imac/ilp32d/use.mask | 10 ++++++ profiles/arch/riscv/rv32imac/make.defaults | 23 +++++++++++++ profiles/arch/riscv/rv32imac/parent | 2 ++ profiles/arch/riscv/rv32imac/use.force | 5 +++ profiles/arch/riscv/rv32imac/use.mask | 6 ++++ profiles/arch/riscv/rv64gc/lp64/use.mask | 2 ++ profiles/arch/riscv/rv64gc/lp64d/use.mask | 2 ++ profiles/arch/riscv/rv64gc/make.defaults | 25 +++----------- profiles/arch/riscv/rv64gc/package.mask | 5 --- profiles/arch/riscv/rv64gc/use.force | 4 --- profiles/arch/riscv/rv64gc/use.mask | 8 ++--- profiles/arch/riscv/use.force | 4 +++ profiles/arch/riscv/use.mask | 8 +++-- profiles/arch/sparc/use.stable.mask | 5 --- profiles/arch/x86/make.defaults | 4 +++ profiles/arch/x86/use.stable.mask | 4 +++ 44 files changed, 222 insertions(+), 56 deletions(-) create mode 100644 profiles/arch/riscv/package.mask create mode 100644 profiles/arch/riscv/rv32imac/eapi create mode 100644 profiles/arch/riscv/rv32imac/ilp32/eapi create mode 100644 profiles/arch/riscv/rv32imac/ilp32/make.defaults create mode 100644 profiles/arch/riscv/rv32imac/ilp32/package.use.force create mode 100644 profiles/arch/riscv/rv32imac/ilp32/use.force create mode 100644 profiles/arch/riscv/rv32imac/ilp32/use.mask create mode 100644 profiles/arch/riscv/rv32imac/ilp32d/eapi create mode 100644 profiles/arch/riscv/rv32imac/ilp32d/make.defaults create mode 100644 profiles/arch/riscv/rv32imac/ilp32d/package.use.force create mode 100644 profiles/arch/riscv/rv32imac/ilp32d/use.mask create mode 100644 profiles/arch/riscv/rv32imac/make.defaults create mode 100644 profiles/arch/riscv/rv32imac/parent create mode 100644 profiles/arch/riscv/rv32imac/use.force create mode 100644 profiles/arch/riscv/rv32imac/use.mask delete mode 100644 profiles/arch/riscv/rv64gc/package.mask (limited to 'profiles/arch') diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask index 4f07a51129a5..f93218e132d9 100644 --- a/profiles/arch/amd64/no-multilib/package.mask +++ b/profiles/arch/amd64/no-multilib/package.mask @@ -78,6 +78,7 @@ games-misc/papers-please games-puzzle/triptych games-roguelike/adom games-rpg/baldurs-gate-ee +games-rpg/broken-age games-rpg/costume-quest games-rpg/dear-esther games-rpg/dungeon-defenders diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 099a58aefbd7..6e4e7e3cd1a9 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Thomas Deutschmann (2020-09-07) +# dev-util/nvidia-cuda-toolkit is keyworded on amd64 +app-metrics/collectd -collectd_plugins_gpu_nvidia + # Thomas Deutschmann (2020-08-17) # Columnstore engine is supported on amd64 dev-db/mariadb -columnstore diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index f55e89a559d5..0020c0a53bb4 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -17,9 +17,10 @@ #--- END OF EXAMPLES --- -# Thomas Deutschmann (2020-08-05) +# Thomas Deutschmann (2020-09-07) # sys-cluster/slurm has no stable keywords -app-metrics/collectd collectd_plugins_slurm +# dev-util/nvidia-cuda-toolkit has no stable keywords +app-metrics/collectd collectd_plugins_slurm collectd_plugins_gpu_nvidia # Joonas Niilola (2020-06-21) # sys-apps/apparmor doesn't have stable keywords. diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask index ebbb9d3323f7..b2bb15d45157 100644 --- a/profiles/arch/arm/armv4/package.mask +++ b/profiles/arch/arm/armv4/package.mask @@ -6,6 +6,7 @@ dev-lang/nim dev-lang/rust-bin dev-lang/rust virtual/rust +>=dev-lang/spidermonkey-78 >=gnome-base/librsvg-2.41 >=gnome-base/gnome-core-libs-3.36.5 >=gnome-base/gnome-core-apps-3.36.5 diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask index ebbb9d3323f7..b2bb15d45157 100644 --- a/profiles/arch/arm/armv4t/package.mask +++ b/profiles/arch/arm/armv4t/package.mask @@ -6,6 +6,7 @@ dev-lang/nim dev-lang/rust-bin dev-lang/rust virtual/rust +>=dev-lang/spidermonkey-78 >=gnome-base/librsvg-2.41 >=gnome-base/gnome-core-libs-3.36.5 >=gnome-base/gnome-core-apps-3.36.5 diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask index 71c459a7e8e2..3d3fb68506d2 100644 --- a/profiles/arch/arm/armv5te/package.mask +++ b/profiles/arch/arm/armv5te/package.mask @@ -6,6 +6,7 @@ dev-lang/nim dev-lang/rust-bin dev-lang/rust virtual/rust +>=dev-lang/spidermonkey-78 >=gnome-base/librsvg-2.41 >=gnome-base/gnome-core-libs-3.36.5 >=gnome-base/gnome-core-apps-3.36.5 diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults index 972d7a5a46af..23746eae9be3 100644 --- a/profiles/arch/arm/make.defaults +++ b/profiles/arch/arm/make.defaults @@ -22,4 +22,3 @@ VIDEO_CARDS="exynos fbdev omap" # Michał Górny (2017-03-14) # Unhide the ARM-specific USE_EXPANDs. USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" - diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 322e6a635450..9772a35c0e09 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -1,6 +1,15 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Adam Feldman (2020-09-05) +# dev-util/dogtail is not keyworded for arm +app-text/atril test + +# Sam James (2020-09-05) +# nvidia-texture-tools not useful here +media-libs/devil nvtt +games-strategy/0ad nvtt + # James Le Cuirot (2020-08-19) # Cinnamon is not keyworded on this architecture. x11-themes/arc-theme cinnamon diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 1fff1b12e0ca..f3ef3b29d96b 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,9 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2020-09-05) +# nvidia-texture-tools not useful here +media-libs/devil nvtt +games-strategy/0ad nvtt + # Georgy Yakovlev (2020-08-20) # zfs is keyworded on arm64 -sys-boot/grub libzfs +sys-boot/grub -libzfs # Sam James (2020-08-19) # Needed for openstack, let's come back diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index dac55926b80b..e95a85a5d18a 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Thomas Deutschmann (2020-09-07) +# dev-util/nvidia-cuda-toolkit is only available on amd64 +app-metrics/collectd collectd_plugins_gpu_nvidia + # Sam James (2020-07-03) # Rust is only available on some arches # Bug #728558 diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index 5a6c92e34bc5..1287a5f40973 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -197,6 +197,8 @@ abi_ppc_32 abi_ppc_64 abi_riscv_lp64d abi_riscv_lp64 +abi_riscv_ilp32d +abi_riscv_ilp32 abi_s390_32 abi_s390_64 diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults index e25a2f2759a3..38268c9d0759 100644 --- a/profiles/arch/hppa/make.defaults +++ b/profiles/arch/hppa/make.defaults @@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}" # Donnie Berkholz (2006-08-18) # Defaults for video drivers VIDEO_CARDS="fbdev" + +# Hans de Graaff (2020-09-14) +# Set per-arch to facilitate stabling, bug 728192 +RUBY_TARGETS="ruby25" diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index 534623e3722f..d8e4276c3cfd 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -14,7 +14,7 @@ media-libs/mesa vulkan vulkan-overlay zink # Robin H. Johnson (2020-07-02) # Mask io-uring & zbc pending keywording -sys-block/fio -io-uring zbc +sys-block/fio -io-uring -zbc # Michał Górny (2020-06-14) # Requires dev-python/networkx. diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask index 35d799148af9..bb3bb243752e 100644 --- a/profiles/arch/hppa/use.stable.mask +++ b/profiles/arch/hppa/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Hans de Graaff (2020-09-14) +# Masked per-arch to facilitate stabling, bug 728192 +ruby_targets_ruby26 + # Michał Górny (2020-06-18) # Not ready for stable yet. python_targets_python3_8 diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask index 7ebafb05c018..f4f3331dfe35 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.mask @@ -4,6 +4,7 @@ # Georgy Yakovlev (2020-01-25) # libva unmasked on little-endian profile diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask index 53eee5c0073c..1d366bf3ff1b 100644 --- a/profiles/arch/powerpc/ppc64/package.mask +++ b/profiles/arch/powerpc/ppc64/package.mask @@ -5,6 +5,7 @@ # big-endian ppc64 configs are not provided # however users can unmask and use savedconfig feature sys-kernel/gentoo-kernel +sys-kernel/vanilla-kernel # Georgy Yakovlev (2020-01-21) # buggy on big-endian diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults index bae66d7316cc..3a7d4ac18e7f 100644 --- a/profiles/arch/riscv/make.defaults +++ b/profiles/arch/riscv/make.defaults @@ -1,25 +1,48 @@ # Copyright 2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Main RISC-V profile directory. +# Main RISC-V profile directory. Common settings for all riscv profiles. # This is not a complete profile. Use the subdirectories! ARCH="riscv" ACCEPT_KEYWORDS="riscv ~riscv" -CHOST="riscv64-unknown-linux-gnu" +CFLAGS="-O2 -pipe" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +SYMLINK_LIB="no" + +# Flags for lp64d +LIBDIR_lp64d="lib64/lp64d" +CFLAGS_lp64d="-mabi=lp64d" +LDFLAGS_lp64d="-m elf64lriscv" +CHOST_lp64d="riscv64-unknown-linux-gnu" + +# Flags for lp64 +LIBDIR_lp64="lib64/lp64" +CFLAGS_lp64="-mabi=lp64" +LDFLAGS_lp64="-m elf64lriscv_lp64" +CHOST_lp64="riscv64-unknown-linux-gnu" + +# Flags for ilp32d +LIBDIR_ilp32d="lib32/ilp32d" +CFLAGS_ilp32d="-mabi=ilp32d -march=rv32imafdc" +LDFLAGS_ilp32d="-m elf32lriscv" +CHOST_ilp32d="riscv32-unknown-linux-gnu" + +# Flags for ilp32 +LIBDIR_ilp32="lib32/ilp32" +CFLAGS_ilp32="-mabi=ilp32 -march=rv32imac" +LDFLAGS_ilp32="-m elf32lriscv_ilp32" +CHOST_ilp32="riscv32-unknown-linux-gnu" # Since many people will want to test this in qemu... FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox" # The following stuff is, e.g., defined in subdirs: -# CFLAGS -# CXXFLAGS -# FFLAGS -# FCFLAGS # ABI # DEFAULT_ABI # MULTILIB_ABIS -# CHOST_riscv -# LIBDIR_riscv diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask new file mode 100644 index 000000000000..43580b7b49a0 --- /dev/null +++ b/profiles/arch/riscv/package.mask @@ -0,0 +1,5 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Doesnt work properly with the two-level libdirs + (2020-09-01) # Dependencies not keyworded dev-libs/jansson doc +# Dependencies not keyworded, require by dev-perl/Net-LibIDN, #737594 +net-dns/libidn mono # Jakov Smolic (2020-08-14) # Large amount of missing keywords @@ -78,13 +80,22 @@ dev-libs/libnl python dev-libs/libusb doc dev-libs/libxslt python dev-libs/libyaml doc +dev-python/argcomplete test +dev-python/aiohttp doc test dev-python/cython doc test dev-python/jinja doc test dev-python/lxml test dev-python/markupsafe test +dev-python/numpy lapack +dev-python/pbr test +dev-python/pypiserver test dev-python/pygments doc test dev-python/setuptools test dev-python/snakeoil test +dev-python/sphinx latext doc test +dev-python/sphinxcontrib-spelling test +dev-python/twisted test +dev-python/urllib3 test dev-util/catalyst iso dev-util/meson test dev-util/ninja doc test @@ -92,6 +103,7 @@ dev-util/patchutils test dev-util/pkgconf test dev-util/strace unwind dev-vcs/git cvs highlight gnome-keyring subversion tk xinetd +dev-vcs/mercurial tk zsh-completion media-libs/freetype harfbuzz png media-libs/tiff jbig jpeg test webp net-fs/nfs-utils nfsv41 @@ -111,4 +123,4 @@ sys-devel/gdb source-highlight sys-devel/gettext cvs sys-fs/squashfs-tools lzma sys-libs/libcap-ng python -sys-process/audit gssapi python \ No newline at end of file +sys-process/audit gssapi python diff --git a/profiles/arch/riscv/rv32imac/eapi b/profiles/arch/riscv/rv32imac/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/rv32imac/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv32imac/ilp32/eapi b/profiles/arch/riscv/rv32imac/ilp32/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults new file mode 100644 index 000000000000..959de434af0f --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults @@ -0,0 +1,12 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V rv32imac/ilp32 no-multilib profile + +# We have only one ABI +MULTILIB_ABIS="ilp32" +DEFAULT_ABI="ilp32" +ABI="ilp32" + +# We hide the useflags for the ABIs +USE_EXPAND_HIDDEN="ABI_RISCV" diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force b/profiles/arch/riscv/rv32imac/ilp32/package.use.force new file mode 100644 index 000000000000..dc5b60c2dd26 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/package.use.force @@ -0,0 +1,5 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Undo multilib forcing. +sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32d diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force new file mode 100644 index 000000000000..e54ac40ffd20 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/use.force @@ -0,0 +1,5 @@ +# Un-force the original multilib default-abi flag +-abi_riscv_ilp32d + +# Force the abi of this profile here +abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask new file mode 100644 index 000000000000..c717be8a4aa4 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask @@ -0,0 +1,10 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Mask multilib, since we do not want to use it. +multilib + +# Mask the other multilib flags back for non-multilib profile. +abi_riscv_lp64d +abi_riscv_lp64 +abi_riscv_ilp32d diff --git a/profiles/arch/riscv/rv32imac/ilp32d/eapi b/profiles/arch/riscv/rv32imac/ilp32d/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults new file mode 100644 index 000000000000..bd66a518eab8 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults @@ -0,0 +1,15 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V rv32imac/ilp32d no-multilib profile + +CFLAGS="-O2 -pipe -march=rv32imacdf -mabi=ilp32d" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +# We have only one ABI +MULTILIB_ABIS="ilp32d" + +# We hide the useflags for the ABIs +USE_EXPAND_HIDDEN="ABI_RISCV" diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force new file mode 100644 index 000000000000..cf764cd54132 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force @@ -0,0 +1,5 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Undo multilib forcing. +sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask new file mode 100644 index 000000000000..b2c900da5041 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask @@ -0,0 +1,10 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Mask multilib, since we do not want to use it. +multilib + +# Mask the other multilib flags back for non-multilib profile. +abi_riscv_lp64d +abi_riscv_lp64 +abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv32imac/make.defaults b/profiles/arch/riscv/rv32imac/make.defaults new file mode 100644 index 000000000000..e23fe63fb251 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/make.defaults @@ -0,0 +1,23 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V profile for rv32imac multilib +# +# This immediate profile is ONLY useful for internal purposes. It can NOT +# generate stages or a working system due to limitations in gcc. + +CHOST="riscv32-unknown-linux-gnu" + +# Multilib ABIs +MULTILIB_ABIS="ilp32d ilp32" +DEFAULT_ABI="ilp32d" +ABI="ilp32d" + +# Enable ilp32d by default +ABI_RISCV="ilp32d" + +# Unhide the riscv/riscv-specific USE_EXPANDs +USE_EXPAND_HIDDEN="-ABI_RISCV" + +# Implicitly enable ilp32d in ebuilds without multilib support +IUSE_IMPLICIT="abi_riscv_ilp32d" diff --git a/profiles/arch/riscv/rv32imac/parent b/profiles/arch/riscv/rv32imac/parent new file mode 100644 index 000000000000..6ee1b9eff10c --- /dev/null +++ b/profiles/arch/riscv/rv32imac/parent @@ -0,0 +1,2 @@ +.. +../../../features/multilib diff --git a/profiles/arch/riscv/rv32imac/use.force b/profiles/arch/riscv/rv32imac/use.force new file mode 100644 index 000000000000..069813e17719 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/use.force @@ -0,0 +1,5 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Force the flag corresponding to the default ABI. +abi_riscv_ilp32d diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/use.mask new file mode 100644 index 000000000000..d57df4d6abeb --- /dev/null +++ b/profiles/arch/riscv/rv32imac/use.mask @@ -0,0 +1,6 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Unmask the multilib flags for this arch. +-abi_riscv_ilp32d +-abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask index 9f26ae637a8a..1e0176b85cb0 100644 --- a/profiles/arch/riscv/rv64gc/lp64/use.mask +++ b/profiles/arch/riscv/rv64gc/lp64/use.mask @@ -6,3 +6,5 @@ multilib # Mask the other multilib flags back for non-multilib profile. abi_riscv_lp64d +abi_riscv_ilp32d +abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask b/profiles/arch/riscv/rv64gc/lp64d/use.mask index fd1d1445c965..101528080621 100644 --- a/profiles/arch/riscv/rv64gc/lp64d/use.mask +++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask @@ -6,3 +6,5 @@ multilib # Mask the other multilib flags back for non-multilib profile. abi_riscv_lp64 +abi_riscv_ilp32d +abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults index 46206e24f6d4..a5963cb2fcba 100644 --- a/profiles/arch/riscv/rv64gc/make.defaults +++ b/profiles/arch/riscv/rv64gc/make.defaults @@ -2,32 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # RISC-V profile for rv64gc multilib +# +# This immediate profile is ONLY useful for internal purposes; it can generate +# stages just fine, but the only "hardware" that can run them is qemu-user ... -CFLAGS="-O2 -pipe" -CXXFLAGS="${CFLAGS}" -FFLAGS="${CFLAGS}" -FCFLAGS="${CFLAGS}" +CHOST="riscv64-unknown-linux-gnu" # Multilib ABIs -MULTILIB_ABIS="lp64d lp64" +MULTILIB_ABIS="lp64d lp64 ilp32d ilp32" DEFAULT_ABI="lp64d" ABI="lp64d" -# Library directories -LIBDIR_lp64d="lib64/lp64d" -LIBDIR_lp64="lib64/lp64" -SYMLINK_LIB="no" - -# Flags for lp64d -CFLAGS_lp64d="-mabi=lp64d" -LDFLAGS_lp64d="-m elf64lriscv" -CHOST_lp64d="riscv64-unknown-linux-gnu" - -# Flags for lp64 -CFLAGS_lp64="-mabi=lp64" -LDFLAGS_lp64="-m elf64lriscv_lp64" -CHOST_lp64="riscv64-unknown-linux-gnu" - # Enable lp64d by default ABI_RISCV="lp64d" diff --git a/profiles/arch/riscv/rv64gc/package.mask b/profiles/arch/riscv/rv64gc/package.mask deleted file mode 100644 index 43580b7b49a0..000000000000 --- a/profiles/arch/riscv/rv64gc/package.mask +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Doesnt work properly with the two-level libdirs - (2019-01-09) # no fam providers keyworded yet fam @@ -14,7 +20,6 @@ valgrind # Not tested yet bluetooth -consolekit dbus elogind emacs @@ -33,7 +38,6 @@ lua qt5 ruby slang -sqlite sound systemtap X diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask index 6deea1b90338..af76053d3be8 100644 --- a/profiles/arch/sparc/use.stable.mask +++ b/profiles/arch/sparc/use.stable.mask @@ -23,11 +23,6 @@ openal # clamav has no stable versions yet clamav -# Mike Gilbert (2017-06-08) -# dev-lang/python:3.7 is not stable. -python_targets_python3_8 -python_single_target_python3_8 - # Andrey Grozin (2014-06-25) # no stable version on sparc ecls diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index c0600e4ae9f1..5f26b6eab90f 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -47,3 +47,7 @@ ABI_X86="32" # Enable USE=libtirpc by default, to ease dependency resolution during # the stabilization of glibc-2.26. Bug 657148 USE="libtirpc" + +# Hans de Graaff (2020-09-14) +# Set per-arch to facilitate stabling, bug 728192 +RUBY_TARGETS="ruby25" diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index b0ff96b03f16..b3aa6061b2d5 100644 --- a/profiles/arch/x86/use.stable.mask +++ b/profiles/arch/x86/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Hans de Graaff (2020-09-14) +# Masked per-arch to facilitate stabling, bug 728192 +ruby_targets_ruby26 + # Andreas Sturmlechner (2020-06-06) # sci-libs/mkl is not stable, needs online registration to even run pkg_setup mkl -- cgit v1.2.3