summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2024-03-22 20:40:34 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-03-22 20:40:34 +0100
commitce972e62391302a9453159a075412118908d7ce7 (patch)
tree138b2468eeab64ba16264eb5b02ca63184992026
parentprofiles: Move default-on of USE=cli to 17.0 directory, so it can be "unset" ... (diff)
downloadgentoo-ce972e62391302a9453159a075412118908d7ce7.tar.gz
gentoo-ce972e62391302a9453159a075412118908d7ce7.tar.bz2
gentoo-ce972e62391302a9453159a075412118908d7ce7.zip
profiles: Move default-on of USE=dri to 17.0 directory, so it can be "unset" in 23.0
This way the default can be overridden by in-ebuild use defaults. Bug: https://bugs.gentoo.org/849875 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r--profiles/default/linux/make.defaults6
-rw-r--r--profiles/releases/17.0/make.defaults4
-rw-r--r--profiles/releases/23.0/make.defaults3
3 files changed, 2 insertions, 11 deletions
diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
index a1342b438891..12dd86f25c53 100644
--- a/profiles/default/linux/make.defaults
+++ b/profiles/default/linux/make.defaults
@@ -25,12 +25,6 @@ USE="${USE} seccomp"
# use defaults...
USE="${USE} pcre"
-# Donnie Berkholz <dberkholz@gentoo.org> (2006-03-07)
-# Modular X: Support direct rendering by default
-# Andreas K. Huettel <dilfridge@gentoo.org> (2013-01-21)
-# Re-added following discussion with chithead
-USE="${USE} dri"
-
# Luca Barbato <lu_zero@gentoo.org> (2006-10-28)
# on glibc system you cannot turn it off
USE="${USE} iconv"
diff --git a/profiles/releases/17.0/make.defaults b/profiles/releases/17.0/make.defaults
index b64025222418..033d62626f91 100644
--- a/profiles/releases/17.0/make.defaults
+++ b/profiles/releases/17.0/make.defaults
@@ -2,5 +2,5 @@
# Distributed under the terms of the GNU General Public License v2
# make sure toolchain has sane defaults <toolchain@gentoo.org>
-# move cli here from default/linux
-USE="${USE} cli fortran openmp"
+# move cli and dri here from default/linux
+USE="${USE} cli dri fortran openmp"
diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index 1e73a1f8de78..9680364430cf 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -10,9 +10,6 @@ USE="lzma zstd"
# make sure toolchain has sane defaults <toolchain@gentoo.org>
USE="${USE} openmp"
-# bug 849875
-USE="${USE} -dri"
-
# bug 818376 (only on specific arches)
LDFLAGS="-Wl,-O1 -Wl,--as-needed"