diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2018-01-27 15:39:00 -0500 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2018-01-28 11:34:43 -0500 |
commit | deb72d3a8b4e6f37c9191a229bbe19affa597492 (patch) | |
tree | 796201289c1072d8f98d34c948a1076fab6feb5c /profiles/features | |
parent | profiles: fix inheritance in hardened/linux/musl/x86, bug #645926 (diff) | |
download | gentoo-deb72d3a8b4e6f37c9191a229bbe19affa597492.tar.gz gentoo-deb72d3a8b4e6f37c9191a229bbe19affa597492.tar.bz2 gentoo-deb72d3a8b4e6f37c9191a229bbe19affa597492.zip |
profiles: restructure amd64, arm and x86 musl profiles
This restructuring brings the musl profiles into conformity
with the glibc profiles for amd64, arm and x86. Yet to be
done are the profiles for ppc and mips.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'profiles/features')
-rw-r--r-- | profiles/features/musl/eapi | 1 | ||||
-rw-r--r-- | profiles/features/musl/make.defaults | 18 | ||||
-rw-r--r-- | profiles/features/musl/package.mask | 26 | ||||
-rw-r--r-- | profiles/features/musl/package.use | 7 | ||||
-rw-r--r-- | profiles/features/musl/package.use.force | 9 | ||||
-rw-r--r-- | profiles/features/musl/package.use.mask | 19 | ||||
-rw-r--r-- | profiles/features/musl/packages | 6 | ||||
-rw-r--r-- | profiles/features/musl/packages.build | 10 | ||||
-rw-r--r-- | profiles/features/musl/use.force | 6 | ||||
-rw-r--r-- | profiles/features/musl/use.mask | 7 |
10 files changed, 109 insertions, 0 deletions
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 +<net-mail/mailutils-3.2 + +# We use eudev which is tested on both uclibc and musl +sys-apps/systemd +sys-fs/udev + +# dev-libs/elfutils needs a port to musl, bug #602126 +dev-libs/elfutils +>virtual/libelf-2 + +# packages that unconditionally depend on dev-libs/elfutils +<net-firewall/fwbuilder-5.3.7 + +# Ian Stakenvicius, 2017-06-14 +# on behalf of mozilla@gentoo.org +# Mask firefox-54 and above as it requires rust +# now, and rust reportedly will not build yet. +>=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 <blueness@gentoo.org> (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 <libintl.h> +# 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 |