commit:     c7db011db1bd61272373c32a0a5683d4b55a3d30
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 17:12:33 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:13:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7db011d

usr-ldscript.eclass: add EAPI check and drop legacy code

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/usr-ldscript.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass
index 1a115ca6a88..4d503e7d6db 100644
--- a/eclass/usr-ldscript.eclass
+++ b/eclass/usr-ldscript.eclass
@@ -4,11 +4,17 @@
 # @ECLASS: usr-ldscript.eclass
 # @MAINTAINER:
 # Toolchain Ninjas <[email protected]>
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Defines the gen_usr_ldscript function.
 
 if [[ -z ${_USR_LDSCRIPT_ECLASS} ]]; then
 _USR_LDSCRIPT_ECLASS=1
 
+case ${EAPI:-0} in
+       4|5|6|7) ;;
+       *) die "EAPI=${EAPI} is not supported" ;;
+esac
+
 inherit multilib toolchain-funcs
 
 IUSE="split-usr"
@@ -29,7 +35,6 @@ IUSE="split-usr"
 # correctly to point to the latest version of the library present.
 gen_usr_ldscript() {
        local lib libdir=$(get_libdir) output_format="" auto=false 
suffix=$(get_libname)
-       [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
 
        tc-is-static-only && return
 

Reply via email to