diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-06 18:23:20 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-06 18:23:20 +0000 |
| commit | d37b97a25b8b10f748eead6574b01f893f140b01 (patch) | |
| tree | 13e2a142a31cd193a39c63042a64cab29a1f7ae9 /eclass | |
| parent | a833e3f4a431b8eea751b7420e127787f9c92117 (diff) | |
gentoo resync : 06.12.2017
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41502 -> 41504 bytes | |||
| -rw-r--r-- | eclass/cmake-utils.eclass | 4 | ||||
| -rw-r--r-- | eclass/prefix.eclass | 5 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex cb6abacbf046..bdd928ae1a49 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 28b29eb3f0f9..7b12a6e7d7f3 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -110,7 +110,7 @@ case ${EAPI} in esac inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \ - multiprocessing versionator + multiprocessing versionator xdg-utils EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install @@ -491,7 +491,7 @@ cmake-utils_src_configure() { _cmake_check_build_dir # Fix xdg collision with sandbox - local -x XDG_CONFIG_HOME="${T}" + xdg_environment_reset # @SEE CMAKE_BUILD_TYPE if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then diff --git a/eclass/prefix.eclass b/eclass/prefix.eclass index eb5843182f31..8ae3e3a531d5 100644 --- a/eclass/prefix.eclass +++ b/eclass/prefix.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: prefix.eclass @@ -48,8 +48,7 @@ eprefixify() { } # @FUNCTION: hprefixify -# @USAGE: [ -w <line match> ] [ -e <extended regex> ] [ -q <quotation char> ] -# <list of files> +# @USAGE: [ -w <line match> ] [ -e <extended regex> ] [ -q <quotation char> ] <list of files> # @DESCRIPTION: # Tries a set of heuristics to prefixify the given files. Dies if no # arguments are given, a file does not exist, or changing a file failed. diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 503f7dbe94ff..58d859dfaf32 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -378,9 +378,6 @@ toolchain_pkg_pretend() { "in your make.conf if you want to use this version." fi - [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && \ - die "Sorry, this version does not support uClibc" - if ! use_if_iuse cxx ; then use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"' use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"' |