diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-03-30 16:03:35 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-03-30 18:03:07 -0400 |
| commit | e7a6cbdba8e038f094b4719356a31a2e25a4d8e9 (patch) | |
| tree | c22ae57d6aa5d071b7f420ed0f35c852c8007007 /sys-libs/glibc | |
| parent | sys-libs/glibc: add USE=rpc to control obsolete RPC/NIS APIs #381391 #576278 (diff) | |
| download | gentoo-e7a6cbdba8e038f094b4719356a31a2e25a4d8e9.tar.gz gentoo-e7a6cbdba8e038f094b4719356a31a2e25a4d8e9.tar.bz2 gentoo-e7a6cbdba8e038f094b4719356a31a2e25a4d8e9.zip | |
sys-libs/glibc: add USE=audit & USE=caps #401677
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_configure.eblit | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.23.ebuild | 20 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 20 |
3 files changed, 35 insertions, 12 deletions
diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit index 41ba5ddf7ad0..be6f52cb99d1 100644 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ b/sys-libs/glibc/files/eblits/src_configure.eblit @@ -124,6 +124,10 @@ glibc_do_configure() { myconf+=( $(use_enable vanilla timezone-tools) ) fi + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no) + ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no) + # There is no configure option for this and we need to export it # since the glibc build will re-run configure on itself export libc_cv_slibdir=/$(get_libdir) @@ -204,6 +208,9 @@ toolchain-glibc_headers_configure() { libc_cv_z_relro=yes libc_mips_abi=${ABI} libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard) + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=no + ac_cv_lib_cap_cap_init=no ) einfo "Forcing cached settings:" for v in "${vars[@]}" ; do diff --git a/sys-libs/glibc/glibc-2.23.ebuild b/sys-libs/glibc/glibc-2.23.ebuild index c8cb72a81459..501ce19b8e66 100644 --- a/sys-libs/glibc/glibc-2.23.ebuild +++ b/sys-libs/glibc/glibc-2.23.ebuild @@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="3" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires -IUSE="debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -64,13 +64,21 @@ SLOT="2.2" # General: We need a new-enough binutils/gcc to match upstream baseline. # arch: we need to make sure our binutils/gcc supports TLS. -DEPEND=">=app-misc/pax-utils-0.1.10 +COMMON_DEPEND=" + nscd? ( selinux? ( + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap ) + ) ) + suid? ( caps? ( sys-libs/libcap ) ) + selinux? ( sys-libs/libselinux ) +" +DEPEND="${COMMON_DEPEND} + >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources + !<sys-apps/portage-2.1.2" +RDEPEND="${COMMON_DEPEND} + !sys-kernel/ps3-sources sys-apps/gentoo-functions - selinux? ( sys-libs/libselinux ) !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 3263afea8618..7ec51135a9b7 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires -IUSE="debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -64,13 +64,21 @@ SLOT="2.2" # General: We need a new-enough binutils/gcc to match upstream baseline. # arch: we need to make sure our binutils/gcc supports TLS. -DEPEND=">=app-misc/pax-utils-0.1.10 +COMMON_DEPEND=" + nscd? ( selinux? ( + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap ) + ) ) + suid? ( caps? ( sys-libs/libcap ) ) + selinux? ( sys-libs/libselinux ) +" +DEPEND="${COMMON_DEPEND} + >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources + !<sys-apps/portage-2.1.2" +RDEPEND="${COMMON_DEPEND} + !sys-kernel/ps3-sources sys-apps/gentoo-functions - selinux? ( sys-libs/libselinux ) !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then |