diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-07-14 20:47:12 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-07-14 22:45:54 +0200 |
| commit | 4ced298fd259cbd089f994e084b30a58718b37fe (patch) | |
| tree | 15de8bab2847e475e11b3915ee811765217cea7c /profiles/features | |
| parent | sys-libs/glibc: ~arch revision bump without changes (diff) | |
| download | gentoo-4ced298fd259cbd089f994e084b30a58718b37fe.tar.gz gentoo-4ced298fd259cbd089f994e084b30a58718b37fe.tar.bz2 gentoo-4ced298fd259cbd089f994e084b30a58718b37fe.zip | |
package.use.{mask,force}: adapt for libxcrypt transition, except musl/uclibc
Bug: https://bugs.gentoo.org/699422
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'profiles/features')
| -rw-r--r-- | profiles/features/musl/package.use.force | 4 | ||||
| -rw-r--r-- | profiles/features/musl/package.use.mask | 4 | ||||
| -rw-r--r-- | profiles/features/uclibc/package.use.force | 6 | ||||
| -rw-r--r-- | profiles/features/uclibc/package.use.mask | 4 |
4 files changed, 18 insertions, 0 deletions
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force index c26a7ba83f24..da728fcc47ae 100644 --- a/profiles/features/musl/package.use.force +++ b/profiles/features/musl/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 +# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14) +# Do not force system install for libxcrypt here +>=sys-libs/libxcrypt-4.4.23-r1 -system -compat + # Force system-libevent use flag on mozilla packages, since the building of # bundled libevent cannot accomodate a system without sysctl.h # See bug 574830 for more info. diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index afdd59ca5f50..58cd6477116c 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 +# Andreas K. Hüttel <dilfridge@gentoo.org> +# Restore mask here that is gone elsewhere +sys-libs/libxcrypt split-usr system + # James Le Cuirot <chewi@gentoo.org> (2020-05-16) # execinfo.h is required for debug. dev-games/cegui debug diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force new file mode 100644 index 000000000000..82ca48bfea6c --- /dev/null +++ b/profiles/features/uclibc/package.use.force @@ -0,0 +1,6 @@ +# Copyright 2021 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14) +# Do not force system install for libxcrypt here +>=sys-libs/libxcrypt-4.4.23-r1 -system -compat diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask index 1c6069c30db8..b3f8a9ebe24a 100644 --- a/profiles/features/uclibc/package.use.mask +++ b/profiles/features/uclibc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas K. Hüttel <dilfridge@gentoo.org> +# Restore mask here that is gone elsewhere +sys-libs/libxcrypt split-usr system + # Anthony G. Basile <blueness@gentoo.org> # sanitize is broken on at least all hardened uclibc sys-devel/gcc sanitize |