diff options
| author |   David Seifert <soap@gentoo.org> | 2024-10-08 17:31:16 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2024-10-08 17:31:16 +0200 |
| commit | 1e44aed83bc6bd9f6452439f8ccefd7854a36545 (patch) | |
| tree | c6b51c7ce6c5c74dca7c25143c385a4b9e36a14e /eclass | |
| parent | multibuild.eclass: drop support for EAPI 6 (diff) | |
| download | gentoo-1e44aed83bc6bd9f6452439f8ccefd7854a36545.tar.gz gentoo-1e44aed83bc6bd9f6452439f8ccefd7854a36545.tar.bz2 gentoo-1e44aed83bc6bd9f6452439f8ccefd7854a36545.zip | |
multilib-build.eclass: drop support for EAPI 6
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib-build.eclass | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 22c4a8bb3048..375adc46531a 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -6,7 +6,7 @@ # Michał Górny <mgorny@gentoo.org> # @AUTHOR: # Author: Michał Górny <mgorny@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: flags and utility functions for building multilib packages # @DESCRIPTION: # The multilib-build.eclass exports USE flags and utility functions @@ -21,10 +21,6 @@ if [[ -z ${_MULTILIB_BUILD_ECLASS} ]]; then _MULTILIB_BUILD_ECLASS=1 case ${EAPI} in - 6) - ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" - ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." - ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -257,8 +253,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 } @@ -380,7 +376,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 @@ -448,9 +444,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 @@ -508,7 +504,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}>&" \ @@ -548,11 +544,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 } |