gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

profiles: Drop ABI_RISCV from riscv profiles; it's multilib overkill

Browse Source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel
2020-09-16 23:44:01 +03:00
parent 0020436c63
commit ca545f53d7
25 changed files with 18 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
profiles/arch/base/use.mask
View File

@@ -195,10 +195,6 @@ abi_mips_n32
abi_mips_n64
abi_ppc_32
abi_ppc_64
abi_riscv_lp64d
abi_riscv_lp64
abi_riscv_ilp32d
abi_riscv_ilp32
abi_s390_32
abi_s390_64

3
profiles/arch/riscv/rv32imac/ilp32/make.defaults
View File

@@ -7,6 +7,3 @@
MULTILIB_ABIS="ilp32"
DEFAULT_ABI="ilp32"
ABI="ilp32"
# We hide the useflags for the ABIs
USE_EXPAND_HIDDEN="ABI_RISCV"

2
profiles/arch/riscv/rv32imac/ilp32/package.use.force
View File

@@ -1,5 +1,3 @@
# 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

7
profiles/arch/riscv/rv32imac/ilp32/use.force
View File

@@ -1,5 +1,2 @@
# Un-force the original multilib default-abi flag
-abi_riscv_ilp32d
# Force the abi of this profile here
abi_riscv_ilp32
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

5
profiles/arch/riscv/rv32imac/ilp32/use.mask
View File

@@ -3,8 +3,3 @@
# 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

3
profiles/arch/riscv/rv32imac/ilp32d/make.defaults
View File

@@ -10,6 +10,3 @@ FCFLAGS="${CFLAGS}"
# We have only one ABI
MULTILIB_ABIS="ilp32d"
# We hide the useflags for the ABIs
USE_EXPAND_HIDDEN="ABI_RISCV"

5
profiles/arch/riscv/rv32imac/ilp32d/package.use.force
View File

@@ -1,5 +1,2 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 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

7
profiles/arch/riscv/rv32imac/ilp32d/use.mask
View File

@@ -1,10 +1,5 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 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

9
profiles/arch/riscv/rv32imac/make.defaults
View File

@@ -12,12 +12,3 @@ CHOST="riscv32-unknown-linux-gnu"
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"

5
profiles/arch/riscv/rv32imac/use.force
View File

@@ -1,5 +1,2 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Force the flag corresponding to the default ABI.
abi_riscv_ilp32d

6
profiles/arch/riscv/rv32imac/use.mask
View File

@@ -1,6 +1,2 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 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

3
profiles/arch/riscv/rv64gc/lp64/make.defaults
View File

@@ -12,6 +12,3 @@ FCFLAGS="${CFLAGS}"
MULTILIB_ABIS="lp64"
DEFAULT_ABI="lp64"
ABI="lp64"
# We hide the useflags for the ABIs
USE_EXPAND_HIDDEN="ABI_RISCV"

5
profiles/arch/riscv/rv64gc/lp64/package.use.force
View File

@@ -1,5 +1,2 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Undo multilib forcing.
sys-apps/sandbox -abi_riscv_lp64d

7
profiles/arch/riscv/rv64gc/lp64/use.force
View File

@@ -1,5 +1,2 @@
# Un-force the original multilib default-abi flag
-abi_riscv_lp64d
# Force the abi of this profile here
abi_riscv_lp64
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

7
profiles/arch/riscv/rv64gc/lp64/use.mask
View File

@@ -1,10 +1,5 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 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_ilp32d
abi_riscv_ilp32

3
profiles/arch/riscv/rv64gc/lp64d/make.defaults
View File

@@ -10,6 +10,3 @@ FCFLAGS="${CFLAGS}"
# We have only one ABI
MULTILIB_ABIS="lp64d"
# We hide the useflags for the ABIs
USE_EXPAND_HIDDEN="ABI_RISCV"

5
profiles/arch/riscv/rv64gc/lp64d/package.use.force
View File

@@ -1,5 +1,2 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Undo multilib forcing.
sys-apps/sandbox -abi_riscv_lp64

5
profiles/arch/riscv/rv64gc/lp64d/use.mask
View File

@@ -3,8 +3,3 @@
# Mask multilib, since we do not want to use it.
multilib
# Mask the other multilib flags back for non-multilib profile.
abi_riscv_lp64
abi_riscv_ilp32d
abi_riscv_ilp32

9
profiles/arch/riscv/rv64gc/make.defaults
View File

@@ -12,12 +12,3 @@ CHOST="riscv64-unknown-linux-gnu"
MULTILIB_ABIS="lp64d lp64 ilp32d ilp32"
DEFAULT_ABI="lp64d"
ABI="lp64d"
# Enable lp64d by default
ABI_RISCV="lp64d"
# Unhide the riscv/rv64gc-specific USE_EXPANDs
USE_EXPAND_HIDDEN="-ABI_RISCV"
# Implicitly enable lp64d in ebuilds without multilib support
IUSE_IMPLICIT="abi_riscv_lp64d"

5
profiles/arch/riscv/rv64gc/use.force
View File

@@ -1,5 +1,2 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Force the flag corresponding to the default ABI.
abi_riscv_lp64d

8
profiles/arch/riscv/rv64gc/use.mask
View File

@@ -1,8 +1,2 @@
# Copyright 2019 Gentoo Authors
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Unmask the multilib flags for this arch.
-abi_riscv_lp64d
-abi_riscv_lp64
-abi_riscv_ilp32d
-abi_riscv_ilp32

4
profiles/base/make.defaults
View File

@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on gentoo-dev@lists.gentoo.org.
USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
CONFIG_PROTECT="/etc"
CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"

11
profiles/desc/abi_riscv.desc
View File

@@ -1,11 +0,0 @@
# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# This file contains descriptions of ABI_RISCV USE_EXPAND flags.
# Keep it sorted. Please do not add anything without prior discussion
# on gentoo-dev.
lp64d - 64-bit (rv64) double hard-float libraries
lp64 - 64-bit (rv64) soft-float libraries
ilp32d - 32-bit (rv32) double hard-float libraries
ilp32 - 32-bit (rv32) soft-float libraries

4
profiles/embedded/make.defaults
View File

@@ -30,11 +30,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on gentoo-dev@lists.gentoo.org.
USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
# Variables that are set exclusively by the profile
# and not by user configuration files.

2
profiles/features/multilib/package.use
View File

@@ -3,4 +3,4 @@
# Enable all ABIs by default so we can protect any non-native binaries that
# might be executed.
sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32 abi_mips_n64 abi_riscv_lp64d abi_riscv_lp64 abi_riscv_ilp32d abi_riscv_ilp32 abi_s390_32 abi_s390_64
sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32 abi_mips_n64 abi_s390_32 abi_s390_64