diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
| commit | 4645b6f17f0da81e9fe84081fb126a37102ba153 (patch) | |
| tree | e6c48cf3db2213af38cf528a5364fffd5c74c6d6 /eclass/multilib-build.eclass | |
| parent | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (diff) | |
gentoo resync : 08.05.2018
Diffstat (limited to 'eclass/multilib-build.eclass')
| -rw-r--r-- | eclass/multilib-build.eclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 6356350c43b3..261f0f4a170b 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-build.eclass @@ -20,7 +20,7 @@ if [[ ! ${_MULTILIB_BUILD} ]]; then # EAPI=4 is required for meaningful MULTILIB_USEDEP. case ${EAPI:-0} in - 4|5|6) ;; + 4|5|6|7) ;; *) die "EAPI=${EAPI} is not supported" ;; esac @@ -269,8 +269,8 @@ multilib_check_headers() { _multilib_header_cksum() { set -o pipefail - if [[ -d ${ED}usr/include ]]; then - find "${ED}"usr/include -type f \ + if [[ -d ${ED%/}/usr/include ]]; then + find "${ED%/}"/usr/include -type f \ -exec cksum {} + | sort -k2 fi } @@ -390,7 +390,7 @@ multilib_prepare_wrappers() { [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" - local root=${1:-${ED}} + local root=${1:-${ED%/}} local f if [[ ${COMPLETE_MULTILIB} == yes ]]; then @@ -458,9 +458,9 @@ multilib_prepare_wrappers() { # Some ABIs may have install less files than others. if [[ -f ${root}/usr/include${f} ]]; then - local wrapper=${ED}/tmp/multilib-include${f} + local wrapper=${ED%/}/tmp/multilib-include${f} - if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then + if [[ ! -f ${ED%/}/tmp/multilib-include${f} ]]; then dodir "/tmp/multilib-include${dir}" # a generic template cat > "${wrapper}" <<_EOF_ || die @@ -518,7 +518,7 @@ _EOF_ # $CHOST shall be set by multilib_toolchain_setup dodir "/tmp/multilib-include/${CHOST}${dir}" - mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die + mv "${root}/usr/include${f}" "${ED%/}/tmp/multilib-include/${CHOST}${dir}/" || die # Note: match a space afterwards to avoid collision potential. sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \ @@ -558,11 +558,11 @@ multilib_install_wrappers() { local root=${1:-${ED}} - if [[ -d "${ED}"/tmp/multilib-include ]]; then + if [[ -d ${ED%/}/tmp/multilib-include ]]; then multibuild_merge_root \ - "${ED}"/tmp/multilib-include "${root}"/usr/include + "${ED%/}"/tmp/multilib-include "${root}"/usr/include # it can fail if something else uses /tmp - rmdir "${ED}"/tmp &>/dev/null + rmdir "${ED%/}"/tmp &>/dev/null fi } |