commit: 976d99bbae56b573f3dd0839a147e2359ba401f4 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Dec 4 22:19:29 2022 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Dec 4 22:21:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976d99bb
profiles: 23.0 profile: make this more complete * integrate merged-usr settings here, for use with split-usr feature * add -Wl,-z,pack-relative-relocs Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> profiles/releases/23.0/make.defaults | 12 ++++++++++++ profiles/releases/23.0/package.use.force | 4 ++-- profiles/releases/23.0/package.use.mask | 2 +- profiles/releases/23.0/package.use.stable.mask | 2 -- profiles/releases/23.0/use.force | 6 ++++++ profiles/releases/23.0/use.mask | 6 ++++++ 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults index 7cd1e30dc0a3..c802f3fa3409 100644 --- a/profiles/releases/23.0/make.defaults +++ b/profiles/releases/23.0/make.defaults @@ -1,6 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# See also +# https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition + # This just makes sense nowadays, if only for distfiles... USE="lzma zstd" @@ -9,3 +12,12 @@ USE="${USE} -cli" # bug 849875 USE="${USE} -dri" + +# bug 818376 +LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs" + +# copied from merged-usr feature +# Mike Gilbert <[email protected]> (2022-08-31) +# Avoid removing merged-usr symlinks. +UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin /usr/sbin" +UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /usr/lib/modules/*" diff --git a/profiles/releases/23.0/package.use.force b/profiles/releases/23.0/package.use.force index a424f26e6193..29a80fc588b8 100644 --- a/profiles/releases/23.0/package.use.force +++ b/profiles/releases/23.0/package.use.force @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 ->sys-devel/gcc-12.99 default-znow default-stack-clash-protection +>=sys-devel/gcc-12.3 default-znow default-stack-clash-protection diff --git a/profiles/releases/23.0/package.use.mask b/profiles/releases/23.0/package.use.mask index adc292d4df13..7084783a52c6 100644 --- a/profiles/releases/23.0/package.use.mask +++ b/profiles/releases/23.0/package.use.mask @@ -1,2 +1,2 @@ -# Copyright 2017-2022 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/profiles/releases/23.0/package.use.stable.mask b/profiles/releases/23.0/package.use.stable.mask deleted file mode 100644 index 65c385e7abde..000000000000 --- a/profiles/releases/23.0/package.use.stable.mask +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 diff --git a/profiles/releases/23.0/use.force b/profiles/releases/23.0/use.force new file mode 100644 index 000000000000..b04dc784e183 --- /dev/null +++ b/profiles/releases/23.0/use.force @@ -0,0 +1,6 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Mike Gilbert <[email protected]> (2022-08-30) +# Un-force split-usr. +-split-usr diff --git a/profiles/releases/23.0/use.mask b/profiles/releases/23.0/use.mask new file mode 100644 index 000000000000..4e6cb8ec4a37 --- /dev/null +++ b/profiles/releases/23.0/use.mask @@ -0,0 +1,6 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Mike Gilbert <[email protected]> (2022-08-30) +# Mask split-usr. +split-usr
