| 1 |
commit: 0349659edae44f43075ea37c44afdf8b5dfc843f |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 11:02:27 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 11:02:27 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0349659e |
| 7 |
|
| 8 |
profiles: remove dead kernel/elibc flags |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/base/make.defaults | 4 ++-- |
| 13 |
profiles/base/use.mask | 12 ------------ |
| 14 |
profiles/desc/elibc.desc | 7 ------- |
| 15 |
profiles/desc/kernel.desc | 8 +------- |
| 16 |
profiles/embedded/make.defaults | 4 ++-- |
| 17 |
5 files changed, 5 insertions(+), 30 deletions(-) |
| 18 |
|
| 19 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
| 20 |
index 547c7b31e83c..6548a518da5e 100644 |
| 21 |
--- a/profiles/base/make.defaults |
| 22 |
+++ b/profiles/base/make.defaults |
| 23 |
@@ -7,8 +7,8 @@ |
| 24 |
# Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later) |
| 25 |
IUSE_IMPLICIT="prefix prefix-guest prefix-stack" |
| 26 |
USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND" |
| 27 |
-USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly glibc HPUX Interix mingw musl NetBSD OpenBSD SunOS Winnt" |
| 28 |
-USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt" |
| 29 |
+USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" |
| 30 |
+USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" |
| 31 |
USE_EXPAND_VALUES_USERLAND="BSD GNU" |
| 32 |
|
| 33 |
# Env vars to expand into USE vars. Modifying this requires prior |
| 34 |
|
| 35 |
diff --git a/profiles/base/use.mask b/profiles/base/use.mask |
| 36 |
index 137f6707246c..eee41ca8c6f8 100644 |
| 37 |
--- a/profiles/base/use.mask |
| 38 |
+++ b/profiles/base/use.mask |
| 39 |
@@ -70,26 +70,14 @@ multilib |
| 40 |
# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. |
| 41 |
userland_BSD |
| 42 |
|
| 43 |
-elibc_AIX |
| 44 |
elibc_bionic |
| 45 |
elibc_Cygwin |
| 46 |
elibc_Darwin |
| 47 |
-elibc_DragonFly |
| 48 |
-elibc_HPUX |
| 49 |
-elibc_Interix |
| 50 |
elibc_musl |
| 51 |
-elibc_NetBSD |
| 52 |
-elibc_OpenBSD |
| 53 |
elibc_SunOS |
| 54 |
elibc_Winnt |
| 55 |
|
| 56 |
-kernel_AIX |
| 57 |
kernel_Darwin |
| 58 |
-kernel_FreeBSD |
| 59 |
-kernel_freemint |
| 60 |
-kernel_HPUX |
| 61 |
-kernel_NetBSD |
| 62 |
-kernel_OpenBSD |
| 63 |
kernel_SunOS |
| 64 |
kernel_Winnt |
| 65 |
|
| 66 |
|
| 67 |
diff --git a/profiles/desc/elibc.desc b/profiles/desc/elibc.desc |
| 68 |
index ec994a00e657..8eef69979c83 100644 |
| 69 |
--- a/profiles/desc/elibc.desc |
| 70 |
+++ b/profiles/desc/elibc.desc |
| 71 |
@@ -4,18 +4,11 @@ |
| 72 |
# This file contains descriptions of ELIBC USE_EXPAND flags. |
| 73 |
|
| 74 |
# Keep it sorted. |
| 75 |
- |
| 76 |
-AIX - ELIBC setting for systems that use the AIX C library |
| 77 |
bionic - ELIBC setting for systems that use Android's Bionic C library |
| 78 |
Cygwin - ELIBC setting for systems that use Cygwin |
| 79 |
Darwin - ELIBC setting for systems that use the Darwin C library |
| 80 |
-DragonFly - ELIBC setting for systems that use the DragonFly C library |
| 81 |
glibc - ELIBC setting for systems that use the GNU C library |
| 82 |
-HPUX - ELIBC setting for systems that use the HP-UX C library |
| 83 |
-Interix - ELIBC setting for systems that use the Interix C library |
| 84 |
mingw - ELIBC setting for systems that use the Minimalist GNU for Windows library |
| 85 |
musl - ELIBC setting for systems that use the musl C library |
| 86 |
-NetBSD - ELIBC setting for systems that use the NetBSD C library |
| 87 |
-OpenBSD - ELIBC setting for systems that use the OpenBSD C library |
| 88 |
SunOS - ELIBC setting for systems that use the Sun Solaris C library |
| 89 |
Winnt - ELIBC setting for systems that use Winnt |
| 90 |
|
| 91 |
diff --git a/profiles/desc/kernel.desc b/profiles/desc/kernel.desc |
| 92 |
index 48d6e5455ea8..6658d525396b 100644 |
| 93 |
--- a/profiles/desc/kernel.desc |
| 94 |
+++ b/profiles/desc/kernel.desc |
| 95 |
@@ -1,16 +1,10 @@ |
| 96 |
-# Copyright 1999-2018 Gentoo Foundation |
| 97 |
+# Copyright 1999-2022 Gentoo Authors |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
|
| 100 |
# This file contains descriptions of KERNEL USE_EXPAND flags. |
| 101 |
|
| 102 |
# Keep it sorted. |
| 103 |
-AIX - KERNEL setting for system using the AIX kernel |
| 104 |
Darwin - KERNEL setting for system using the Darwin kernel (i.e.: Mac OS X). |
| 105 |
-FreeBSD - KERNEL setting for system using the FreeBSD kernel |
| 106 |
-freemint - KERNEL setting for system using the FreeMiNT kernel |
| 107 |
-HPUX - KERNEL setting for system using the HP-UX kernel |
| 108 |
linux - KERNEL setting for system using the Linux kernel |
| 109 |
-NetBSD - KERNEL setting for system using the NetBSD kernel |
| 110 |
-OpenBSD - KERNEL setting for system using the OpenBSD kernel |
| 111 |
SunOS - KERNEL setting for system using an SunOS (i.e.: Solaris) kernel |
| 112 |
Winnt - KERNEL setting for systems on Windows (Cygwin, MinGW, Winnt, ...) |
| 113 |
|
| 114 |
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults |
| 115 |
index 4320f726a5e9..a86ce015b4d4 100644 |
| 116 |
--- a/profiles/embedded/make.defaults |
| 117 |
+++ b/profiles/embedded/make.defaults |
| 118 |
@@ -24,8 +24,8 @@ IUSE_IMPLICIT="prefix prefix-guest prefix-stack" |
| 119 |
USE_EXPAND_UNPREFIXED="ARCH" |
| 120 |
USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" |
| 121 |
USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-solaris x86-winnt" |
| 122 |
-USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly glibc HPUX Interix mingw musl NetBSD OpenBSD SunOS Winnt" |
| 123 |
-USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt" |
| 124 |
+USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" |
| 125 |
+USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" |
| 126 |
USE_EXPAND_VALUES_USERLAND="BSD GNU" |
| 127 |
|
| 128 |
# Env vars to expand into USE vars. Modifying this requires prior |
Archives