Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 1/2] usr-ldscript.eclass: add EAPI check and drop legacy code
Date: Mon, 15 Jul 2019 17:26:35
Message-Id: 20190715172550.10111-1-floppym@gentoo.org
1 Signed-off-by: Mike Gilbert <floppym@g.o>
2 ---
3 eclass/usr-ldscript.eclass | 6 +++++-
4 1 file changed, 5 insertions(+), 1 deletion(-)
5
6 diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass
7 index a0fbd7d42ec4..1e631b5a34b7 100644
8 --- a/eclass/usr-ldscript.eclass
9 +++ b/eclass/usr-ldscript.eclass
10 @@ -11,6 +11,11 @@
11 if [[ -z ${_USR_LDSCRIPT_ECLASS} ]]; then
12 _USR_LDSCRIPT_ECLASS=1
13
14 +case ${EAPI:-0} in
15 + 4|5|6|7) ;;
16 + *) die "EAPI=${EAPI} is not supported" ;;
17 +esac
18 +
19 inherit multilib toolchain-funcs
20
21 IUSE="split-usr"
22 @@ -31,7 +36,6 @@ IUSE="split-usr"
23 # correctly to point to the latest version of the library present.
24 gen_usr_ldscript() {
25 local lib libdir=$(get_libdir) output_format="" auto=false suffix=$(get_libname)
26 - [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
27
28 tc-is-static-only && return
29
30 --
31 2.22.0

Replies