diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-03 19:17:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-03 19:17:21 +0000 |
| commit | 81e4fbcb846ed1cabdad699c0029b166dd7273b7 (patch) | |
| tree | 16f1236b7a386949c02a6e3c13d0fcd8298fa133 /eclass | |
| parent | a70f42c65202d88c203c40910fef8f96f333d1ee (diff) | |
gentoo resync : 03.01.2018
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41380 -> 41374 bytes | |||
| -rw-r--r-- | eclass/cmake-utils.eclass | 4 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 14 |
3 files changed, 8 insertions, 10 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex cd264f665aa1..e1e453b7fd7a 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 7b12a6e7d7f3..b9f69a824b14 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -586,12 +586,10 @@ cmake-utils_src_configure() { ELSE () SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE) + SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE) SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) - SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "") - SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) - SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE) ENDIF (NOT APPLE) _EOF_ diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 84909f30ca32..018f48e71069 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kernel-2.eclass @@ -146,7 +146,7 @@ # @DESCRIPTION: # This kernel was already deblobbed elsewhere. # If false, either optional deblobbing will be available -# or the license will note the inclusion of freedist code. +# or the license will note the inclusion of linux-firmware code. # @ECLASS-VARIABLE: K_LONGTERM # @DEFAULT_UNSET @@ -337,8 +337,8 @@ detect_version() { KV_MINOR=$(get_version_component_range 2 ${OKV}) KV_PATCH=$(get_version_component_range 3 ${OKV}) if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then - KV_EXTRA=$(get_version_component_range 4- ${OKV}) - KV_EXTRA=${KV_EXTRA/[-_]*} + KV_EXTRA=$(get_version_component_range 4- ${OKV}) + KV_EXTRA=${KV_EXTRA/[-_]*} else KV_PATCH=$(get_version_component_range 3- ${OKV}) fi @@ -624,7 +624,7 @@ if [[ ${ETYPE} == sources ]]; then # Reflect that kernels contain firmware blobs unless otherwise # stripped - LICENSE="${LICENSE} !deblob? ( freedist )" + LICENSE="${LICENSE} !deblob? ( linux-firmware )" DEPEND+=" deblob? ( ${PYTHON_DEPS} )" @@ -661,7 +661,7 @@ if [[ ${ETYPE} == sources ]]; then else # We have no way to deblob older kernels, so just mark them as # tainted with non-libre materials. - LICENSE="${LICENSE} freedist" + LICENSE="${LICENSE} linux-firmware" fi fi @@ -1243,7 +1243,7 @@ unipatch() { UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch" fi fi - fi + fi done #populate KPATCH_DIRS so we know where to look to remove the excludes |