From 4650985dd0e898b82e0d2ec225931297d4fadccf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 Jan 2018 20:30:04 +0000 Subject: gentoo resync : 31.01.2018 --- profiles/features/hardened/package.use | 5 +++++ profiles/features/hardened/x86/eapi | 1 + profiles/features/hardened/x86/make.defaults | 4 ++++ profiles/features/hardened/x86/parent | 1 + profiles/features/musl/eapi | 1 + profiles/features/musl/make.defaults | 18 ++++++++++++++++++ profiles/features/musl/package.mask | 26 ++++++++++++++++++++++++++ profiles/features/musl/package.use | 7 +++++++ profiles/features/musl/package.use.force | 9 +++++++++ profiles/features/musl/package.use.mask | 19 +++++++++++++++++++ profiles/features/musl/packages | 6 ++++++ profiles/features/musl/packages.build | 10 ++++++++++ profiles/features/musl/use.force | 6 ++++++ profiles/features/musl/use.mask | 7 +++++++ 14 files changed, 120 insertions(+) create mode 100644 profiles/features/hardened/package.use create mode 100644 profiles/features/hardened/x86/eapi create mode 100644 profiles/features/hardened/x86/make.defaults create mode 100644 profiles/features/hardened/x86/parent create mode 100644 profiles/features/musl/eapi create mode 100644 profiles/features/musl/make.defaults create mode 100644 profiles/features/musl/package.mask create mode 100644 profiles/features/musl/package.use create mode 100644 profiles/features/musl/package.use.force create mode 100644 profiles/features/musl/package.use.mask create mode 100644 profiles/features/musl/packages create mode 100644 profiles/features/musl/packages.build create mode 100644 profiles/features/musl/use.force create mode 100644 profiles/features/musl/use.mask (limited to 'profiles/features') diff --git a/profiles/features/hardened/package.use b/profiles/features/hardened/package.use new file mode 100644 index 000000000000..133173669515 --- /dev/null +++ b/profiles/features/hardened/package.use @@ -0,0 +1,5 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +dev-lang/python gdbm +sys-libs/gdbm berkdb diff --git a/profiles/features/hardened/x86/eapi b/profiles/features/hardened/x86/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/features/hardened/x86/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/features/hardened/x86/make.defaults b/profiles/features/hardened/x86/make.defaults new file mode 100644 index 000000000000..bc6776d156e2 --- /dev/null +++ b/profiles/features/hardened/x86/make.defaults @@ -0,0 +1,4 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +USE="pic" diff --git a/profiles/features/hardened/x86/parent b/profiles/features/hardened/x86/parent new file mode 100644 index 000000000000..f3229c5b9876 --- /dev/null +++ b/profiles/features/hardened/x86/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/features/musl/eapi b/profiles/features/musl/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/features/musl/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/features/musl/make.defaults b/profiles/features/musl/make.defaults new file mode 100644 index 000000000000..e2dbf5d8a4b7 --- /dev/null +++ b/profiles/features/musl/make.defaults @@ -0,0 +1,18 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +PORTAGE_LIBC="musl" +ELIBC="musl" + +FEATURES="sandbox sfperms strict" + +USE="nptl unicode -berkdb -gdbm" +BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb -gdbm" + +# All libraries are in /lib or /usr/lib +SYMLINK_LIB="no" +FEATURES="-multilib-strict" + +# TODO: fix so musl doesn't generate this for all packages +# that use a charset, it causes package collisons. +INSTALL_MASK="charset.alias" diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask new file mode 100644 index 000000000000..cb795facd556 --- /dev/null +++ b/profiles/features/musl/package.mask @@ -0,0 +1,26 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +sys-libs/uclibc +sys-libs/uclibc-ng +sys-libs/glibc + +# Older versions of net-mail/mailutils fail on musl, bug #604212 +virtual/libelf-2 + +# packages that unconditionally depend on dev-libs/elfutils +=www-client/firefox-54.0 diff --git a/profiles/features/musl/package.use b/profiles/features/musl/package.use new file mode 100644 index 000000000000..87d13cec246e --- /dev/null +++ b/profiles/features/musl/package.use @@ -0,0 +1,7 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Anthony G. Basile (14 Jul 2016) +# We need this to break a circular dependency with +# 'sys-libs/libcap pam' in stage3 catalyst builds +sys-libs/pam -filecaps diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force new file mode 100644 index 000000000000..c26a7ba83f24 --- /dev/null +++ b/profiles/features/musl/package.use.force @@ -0,0 +1,9 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# 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. +>=www-client/firefox-45.0 system-libevent +>=www-client/seamonkey-2.40 system-libevent +>=mail-client/thunderbird-45.0 system-libevent diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask new file mode 100644 index 000000000000..2c0a91e428ed --- /dev/null +++ b/profiles/features/musl/package.use.mask @@ -0,0 +1,19 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# See bug #604542 +net-misc/iputils idn + +# See bug #504200 +sys-devel/gcc sanitize vtv + +# llvm's sanitizers are also incompatible with musl +sys-devel/llvm sanitize + +# These cause collisions with +# even with --without-included-gettext +sys-devel/gettext nls +sys-fs/e2fsprogs nls + +# See bug #576928 +media-libs/mesa nptl diff --git a/profiles/features/musl/packages b/profiles/features/musl/packages new file mode 100644 index 000000000000..4bbf9c32099c --- /dev/null +++ b/profiles/features/musl/packages @@ -0,0 +1,6 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +*app-misc/pax-utils +*sys-apps/sandbox +-*sys-apps/man-pages diff --git a/profiles/features/musl/packages.build b/profiles/features/musl/packages.build new file mode 100644 index 000000000000..38ed7d274207 --- /dev/null +++ b/profiles/features/musl/packages.build @@ -0,0 +1,10 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# This file lists extra packages needed to build for +# a stage 1 based on this profile. + +dev-util/pkgconf +sys-apps/attr +sys-apps/sandbox +dev-python/pyxattr diff --git a/profiles/features/musl/use.force b/profiles/features/musl/use.force new file mode 100644 index 000000000000..bfe77a581d70 --- /dev/null +++ b/profiles/features/musl/use.force @@ -0,0 +1,6 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Select the correct ELIBC +elibc_musl + diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask new file mode 100644 index 000000000000..46c03330afb4 --- /dev/null +++ b/profiles/features/musl/use.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Select the correct ELIBC +-elibc_musl +elibc_uclibc +elibc_glibc -- cgit v1.2.3