[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/clang/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/clang/

[Sam James]

commit:     0ebcd8f4098468b66ebb890355e740a342a99d01
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 14:14:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 14:15:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebcd8f4

profiles: switch default Python to Python 3.10

Bug: https://bugs.gentoo.org/823185
Bug: https://bugs.gentoo.org/844943
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/base/make.defaults           | 8 +++-----
 profiles/features/clang/make.defaults | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7eab29651de3..326cb28de537 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -123,14 +123,12 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (2018-05-23)
 # sys-apps/baselayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr xml python_targets_python3_9"
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr xml python_targets_python3_10"
 
 # Mike Gilbert <floppym@gentoo.org> (2012-05-15)
 # Default target(s) for python-r1.eclass
-# Michał Górny <mgorny@gentoo.org> (2021-06-01)
-# Updated to python3.9
-PYTHON_TARGETS="python3_9"
-PYTHON_SINGLE_TARGET="python3_9"
+PYTHON_TARGETS="python3_10"
+PYTHON_SINGLE_TARGET="python3_10"
 
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.

diff --git a/profiles/features/clang/make.defaults b/profiles/features/clang/make.defaults
index 7674593179f7..ddb54ae32c7d 100644
--- a/profiles/features/clang/make.defaults
+++ b/profiles/features/clang/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # this is for now highly experimental -dilfridge
@@ -46,7 +46,7 @@ ADDR2LINE="llvm-addr2line"
 BOOTSTRAP_USE="${BOOTSTRAP_USE} ssl curl_ssl_openssl"
 
 # Clang needs this
-BOOTSTRAP_USE="${BOOTSTRAP_USE} python_single_target_python3_9"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} python_single_target_python3_10"
 
 # sys-devel/llvm
 BOOTSTRAP_USE="${BOOTSTRAP_USE} -gold"

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/clang/

[Sam James]

commit:     acacd8e179eb737f7e36c82ca6d8cf236eff0c9a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 23:19:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 23:20:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acacd8e1

profiles: mask dev-lang/rust[llvm-libunwind] on non-LLVM profiles

Doesn't work on e.g. glibc systems. Unmasked on the LLVM profiles.
It doesn't matter much as llvm-libunwind has different semantics
to other packages, i.e. -llvm-libunwind doesn't force use of sys-libs/libunwind
on glibc, so it doesn't prevent usage of llvm-libunwind for other packages.

Closes: https://bugs.gentoo.org/870211
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/base/package.use.mask           | 8 ++++++++
 profiles/features/clang/package.use.mask | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4aac007f6130..79a03f96f100 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,14 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-09-15)
+# Doesn't work on e.g. glibc systems. Unmasked on the LLVM profiles.
+# It doesn't matter much as llvm-libunwind has different semantics
+# to other packages, i.e. -llvm-libunwind doesn't force use of sys-libs/libunwind
+# on glibc, so it doesn't prevent usage of llvm-libunwind for other packages.
+# bug #870211.
+dev-lang/rust -llvm-libunwind
+
 # Sam James <sam@gentoo.org> (2022-09-15)
 # Patch not rebased and supporting it is not a priority: bug #824018.
 >=media-libs/libpng-1.6.38 apng

diff --git a/profiles/features/clang/package.use.mask b/profiles/features/clang/package.use.mask
index 2aa65931d7b2..0975580eab0d 100644
--- a/profiles/features/clang/package.use.mask
+++ b/profiles/features/clang/package.use.mask
@@ -1,5 +1,9 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-09-15)
+# Works on pure LLVM systems: bug #870211.
+dev-lang/rust -llvm-libunwind
+
 # libquadmath is gcc-specific
 dev-lang/perl quadmath