From b66835241373917804cb4be123f7a3b37cd1e14c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 5 Feb 2017 11:08:58 +0100 Subject: [PATCH] profiles: Move arch-specific use.mask entries to arch/base Resulting effective changes: - in ppc64 64le, the 'ibm' flag is masked, - a lot of extra arch masks on Prefix profiles. --- profiles/arch/base/use.mask | 203 ++++++++++++++++++++++++++++++++++++ profiles/base/use.mask | 203 +----------------------------------- 2 files changed, 207 insertions(+), 199 deletions(-) diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index 54a139ff449c..96eb933cd24f 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -1,3 +1,206 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Michael Orlitzky (7 Jan 2017) +# The dev-db/firebird and dev-db/oracle-instantclient* packages +# only support amd64 and x86. +firebird +oci8 + +# cilk has been ported only to x86 systems +cilk + +# cuda only works on amd64/x86 +cuda + +# masking here, and unmasking in arch/x86/use.mask +vidix + +# Mask as long its not available everywhere +zeitgeist + +# vdpau is currently only available with binary nvidia-drivers, thus amd64/x86* +vdpau + +# Infiniband stuff should generaly work on all arches but keyworded only on amd64/x86 +infiniband + +# These need libieee1284 which is amd64/x86 only. +sane_backends_canon_pp +sane_backends_hpsj5s +sane_backends_mustek_pp +sane_backends_qcam + +# amd64/x86 arch specific USE flags +lilo +mpx +svga +nvram +cpu_flags_x86_3dnow +cpu_flags_x86_3dnowext +cpu_flags_x86_aes +cpu_flags_x86_avx +cpu_flags_x86_avx2 +cpu_flags_x86_fma3 +cpu_flags_x86_fma4 +cpu_flags_x86_mmx +cpu_flags_x86_mmxext +cpu_flags_x86_padlock +cpu_flags_x86_popcnt +cpu_flags_x86_sse +cpu_flags_x86_sse2 +cpu_flags_x86_sse3 +cpu_flags_x86_sse4_1 +cpu_flags_x86_sse4_2 +cpu_flags_x86_sse4a +cpu_flags_x86_ssse3 +cpu_flags_x86_xop + +# ppc arch specific USE flags +altivec +ppcsha1 + +# mips arch specific USE flags +fixed-point +loongson2f +mipsdspr1 +mipsdspr2 +mipsfpu + +# ppc64 arch specific USE flags +ibm +ps3 + +# sparc arch specific USE flags +vis + +# arm arch specific USE flags +armvfp +armv5te +armv6 +armv6t2 +iwmmxt +neon + +# nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers +nvidia + +# dev-db/oracle-instantclient-basic is only available on x86 +oci8-instant-client +oracle + +# not keyworded on non-x86 systems +video_cards_geode +video_cards_voodoo + +# not needed on non-sparc systems +video_cards_sunbw2 +video_cards_suncg14 +video_cards_suncg3 +video_cards_suncg6 +video_cards_sunffb +video_cards_sunleo +video_cards_suntcx + +# not needed on non-mips systems +video_cards_newport + +# not needed on non-x86, non-amd64 systems +input_devices_vmmouse +video_cards_nvidia +video_cards_fglrx +video_cards_via +video_cards_vmware +video_cards_virtualbox + +# not needed on non-arm systems +video_cards_exynos +video_cards_freedreno +video_cards_omap +video_cards_omapfb +video_cards_tegra +video_cards_vc4 +video_cards_vivante + +# linux-only drivers +video_cards_qxl + +# not needed on non-x86, non-amd64, non-ppc systems +input_devices_synaptics +input_devices_wacom + +# Robert Buchholz (03 Jun 2007) +# Only works on x86 or amd64 +lcd_devices_svga +lcd_devices_luise + +# Joseph Jezak (11 Mar 2007) +# Only for x86 and amd64 (in pbbuttonsd) +macbook + +# George Shapovalov (8 Apr 2007) +# Ada is supported only on x86, amd64 and ppc at present +ada + +# Alex Legler (7 Dec 2009) +# Rubinius is whitelisted on supported arches +ruby_targets_rbx + +# Samuli Suominen (03 Oct 2011) +# RealMagic Hollywood+/Creative DXR3 support +# Still using obsolete V4L1 wrt bug 350211 +# If fixed, should be unmasked in amd64/x86/ppc32 use.mask +dxr3 + +# Diego Elio Pettenò (21 Aug 2012) +# IPMI is only implemented for x86, amd64 and ia64 +ipmi + +# Alexandre Rostovtsev (09 Dec 2012) +# dev-lang/orc is useful only for some specific arches (amd64/x86/arm/...) +orc + +# Mike Gilbert (02 Jan 2013) +# PyPy is unkeyworded on most arches. If you are running amd64 or x86, +# please switch to one of the testing 13.0 profiles to get it. +python_targets_pypy +python_single_target_pypy +python_targets_pypy3 +python_single_target_pypy3 + +# Michał Górny (26 Jan 2013) +# Mask the multilib flags globally. Unmasked in specific arches. +abi_x86_32 +abi_x86_64 +abi_x86_x32 +# Matt Turner (29 Jul 2013) +abi_mips_o32 +abi_mips_n32 +abi_mips_n64 +abi_ppc_32 +abi_ppc_64 +abi_s390_32 +abi_s390_64 + +# Andrey Grozin (25 Jun 2014) +# These lisps are available only on some arches +clisp +clozurecl +cmucl +ecls +gcl +sbcl + +# Michał Górny (4 May 2013) +# Mask systemd flag globally, unmasked on arches on which systemd +# is keyworded. +systemd + +# Mike Gilbert (19 Oct 2014) +# sys-libs/libapparmor +apparmor + # Mask flags that correspond to all possible ARCH values. alpha amd64 diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 480c8ee49ffd..370b9b6ba0d4 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -2,30 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# This file is only for generic masks. For arch-specific masks (i.e. +# mask everywhere, unmask on arch/*) use arch/base. + # Michał Górny (25 Jan 2017) # Masked until dev-lang/python:3.6 is unmasked python_targets_python3_6 python_single_target_python3_6 -# Michael Orlitzky (7 Jan 2017) -# The dev-db/firebird and dev-db/oracle-instantclient* packages -# only support amd64 and x86. -firebird -oci8 - # Michael Palimaka (29 Dec 2016) # elogind support is not yet fully implemented in all required packages elogind -# cilk has been ported only to x86 systems -cilk - # CURL_SSL=winssl is for prefix/windows/winnt only curl_ssl_winssl -# cuda only works on amd64/x86 -cuda - # on the way out ruby_targets_jruby ruby_targets_ruby19 @@ -37,128 +28,13 @@ kmod # not ready for primetime packagekit -# masking here, and unmasking in arch/x86/use.mask -vidix - -# Mask as long its not available everywhere -zeitgeist - -# vdpau is currently only available with binary nvidia-drivers, thus amd64/x86* -vdpau - -# Infiniband stuff should generaly work on all arches but keyworded only on amd64/x86 -infiniband - -# These need libieee1284 which is amd64/x86 only. -sane_backends_canon_pp -sane_backends_hpsj5s -sane_backends_mustek_pp -sane_backends_qcam - # profile specific USE flags # Don't put hardened in here. +# TODO: move multilib into arch/base once inherit order is fixed selinux uclibc multilib -# amd64/x86 arch specific USE flags -lilo -mpx -svga -nvram -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_aes -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -cpu_flags_x86_mmx -cpu_flags_x86_mmxext -cpu_flags_x86_padlock -cpu_flags_x86_popcnt -cpu_flags_x86_sse -cpu_flags_x86_sse2 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_sse4_2 -cpu_flags_x86_sse4a -cpu_flags_x86_ssse3 -cpu_flags_x86_xop - -# ppc arch specific USE flags -altivec -ppcsha1 - -# mips arch specific USE flags -fixed-point -loongson2f -mipsdspr1 -mipsdspr2 -mipsfpu - -# ppc64 arch specific USE flags -ibm -ps3 - -# sparc arch specific USE flags -vis - -# arm arch specific USE flags -armvfp -armv5te -armv6 -armv6t2 -iwmmxt -neon - -# nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers -nvidia - -# dev-db/oracle-instantclient-basic is only available on x86 -oci8-instant-client -oracle - -# not keyworded on non-x86 systems -video_cards_geode -video_cards_voodoo - -# not needed on non-sparc systems -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx - -# not needed on non-mips systems -video_cards_newport - -# not needed on non-x86, non-amd64 systems -input_devices_vmmouse -video_cards_nvidia -video_cards_fglrx -video_cards_via -video_cards_vmware -video_cards_virtualbox - -# not needed on non-arm systems -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_omapfb -video_cards_tegra -video_cards_vc4 -video_cards_vivante - -# linux-only drivers -video_cards_qxl - -# not needed on non-x86, non-amd64, non-ppc systems -input_devices_synaptics -input_devices_wacom - # Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. userland_BSD @@ -193,38 +69,15 @@ kernel_Winnt aqua coreaudio -# Robert Buchholz (03 Jun 2007) -# Only works on x86 or amd64 -lcd_devices_svga -lcd_devices_luise - -# Joseph Jezak (11 Mar 2007) -# Only for x86 and amd64 (in pbbuttonsd) -macbook - -# George Shapovalov (8 Apr 2007) -# Ada is supported only on x86, amd64 and ppc at present -ada - # Jeremy Olexa # The prefix USE flags should never be used on non prefix profiles prefix prefix-guest -# Alex Legler (7 Dec 2009) -# Rubinius is whitelisted on supported arches -ruby_targets_rbx - # Diego E. Pettenò (19 Oct 2010) # masking flags that only apply to FreeBSD kqueue -# Samuli Suominen (03 Oct 2011) -# RealMagic Hollywood+/Creative DXR3 support -# Still using obsolete V4L1 wrt bug 350211 -# If fixed, should be unmasked in amd64/x86/ppc32 use.mask -dxr3 - # Ralph Sennhauser (31 Jul 2012) # Unmask in arch specific profiles when jython implementaton is available. python_targets_jython2_7 @@ -234,54 +87,10 @@ python_single_target_jython2_7 # Prelude is being masked for removal prelude -# Diego Elio Pettenò (21 Aug 2012) -# IPMI is only implemented for x86, amd64 and ia64 -ipmi - # Diego Elio Pettenò (27 Aug 2012) # netlink is a Linux-specific interface netlink -# Alexandre Rostovtsev (09 Dec 2012) -# dev-lang/orc is useful only for some specific arches (amd64/x86/arm/...) -orc - -# Mike Gilbert (02 Jan 2013) -# PyPy is unkeyworded on most arches. If you are running amd64 or x86, -# please switch to one of the testing 13.0 profiles to get it. -python_targets_pypy -python_single_target_pypy -python_targets_pypy3 -python_single_target_pypy3 - -# Michał Górny (26 Jan 2013) -# Mask the multilib flags globally. Unmasked in specific arches. -abi_x86_32 -abi_x86_64 -abi_x86_x32 -# Matt Turner (29 Jul 2013) -abi_mips_o32 -abi_mips_n32 -abi_mips_n64 -abi_ppc_32 -abi_ppc_64 -abi_s390_32 -abi_s390_64 - -# Andrey Grozin (25 Jun 2014) -# These lisps are available only on some arches -clisp -clozurecl -cmucl -ecls -gcl -sbcl - -# Michał Górny (4 May 2013) -# Mask systemd flag globally, unmasked on arches on which systemd -# is keyworded. -systemd - # Pacho Ramos (28 Sep 2013) # This USE flag is available after long dicussion in # http://www.gossamer-threads.com/lists/gentoo/dev/276077 @@ -290,10 +99,6 @@ systemd # could suffer unexpected problem, don't expect support for it then. openrc-force -# Mike Gilbert (19 Oct 2014) -# sys-libs/libapparmor -apparmor - # Brian Evans (2 Dec 2015) # php 5.4 is end of life, masked for removal php_targets_php5-4 -- 2.26.2