From 65737cf14a7220bd9a487aa2af4ae0e79bd23e86 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Jan 2018 21:45:04 +0000 Subject: gentoo resync : 08.01.2018 --- eclass/Manifest.gz | Bin 41191 -> 41197 bytes eclass/kernel-2.eclass | 4 ++-- eclass/toolchain-glibc.eclass | 6 +++--- eclass/toolchain.eclass | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index e2a21e4f679c..1dc0576569ae 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 018f48e71069..a42d5f5ec24b 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -667,7 +667,7 @@ if [[ ${ETYPE} == sources ]]; then elif [[ ${ETYPE} == headers ]]; then DESCRIPTION="Linux system headers" - IUSE="crosscompile_opts_headers-only" + IUSE="headers-only" # Since we should NOT honour KBUILD_OUTPUT in headers # lets unset it here. @@ -693,7 +693,7 @@ kernel_header_destdir() { # @DESCRIPTION: # set use if necessary for cross compile support cross_pre_c_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } # @FUNCTION: env_setup_xmakeopts diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass index d9c692f2ad8f..bea0299d3de6 100644 --- a/eclass/toolchain-glibc.eclass +++ b/eclass/toolchain-glibc.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: toolchain-glibc.eclass @@ -398,7 +398,7 @@ foreach_abi() { } just_headers() { - is_crosscompile && use crosscompile_opts_headers-only + is_crosscompile && use headers-only } glibc_banner() { @@ -592,7 +592,7 @@ eend_KV() { get_kheader_version() { printf '#include \nLINUX_VERSION_CODE\n' | \ - $(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \ + $(tc-getCPP ${CTARGET}) -I "$(alt_build_headers)" - | \ tail -n 1 } diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 7fc4c70652f3..c1fe72d93542 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -993,7 +993,7 @@ toolchain_src_configure() { --disable-threads --without-headers ) - elif has_version "${CATEGORY}/${needed_libc}[crosscompile_opts_headers-only(-)]" ; then + elif has_version "${CATEGORY}/${needed_libc}[headers-only(-)]" ; then confgcc+=( "${confgcc_no_libc[@]}" --with-sysroot="${PREFIX}"/${CTARGET} -- cgit v1.2.3