Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: base-system@g.o, toolchain@g.o
Subject: [gentoo-dev] [PATCH 4/6] usr-ldscript.eclass: return early if USE=split-usr is disabled
Date: Sun, 14 Jul 2019 23:51:43
Message-Id: 20190714235007.5388-5-floppym@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/6] Make 'split-usr' USE flag global and use it in gen_usr_ldscript by Mike Gilbert
1 Bug: https://bugs.gentoo.org/417451
2 Signed-off-by: Mike Gilbert <floppym@g.o>
3 ---
4 eclass/usr-ldscript.eclass | 6 +++++-
5 1 file changed, 5 insertions(+), 1 deletion(-)
6
7 diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass
8 index c1abbb49f4ba..a0fbd7d42ec4 100644
9 --- a/eclass/usr-ldscript.eclass
10 +++ b/eclass/usr-ldscript.eclass
11 @@ -13,6 +13,8 @@ _USR_LDSCRIPT_ECLASS=1
12
13 inherit multilib toolchain-funcs
14
15 +IUSE="split-usr"
16 +
17 # @FUNCTION: gen_usr_ldscript
18 # @USAGE: [-a] <list of libs to create linker scripts for>
19 # @DESCRIPTION:
20 @@ -43,7 +45,9 @@ gen_usr_ldscript() {
21 *-darwin*) ;;
22 *-android*) return 0 ;;
23 *linux*|*-freebsd*|*-openbsd*|*-netbsd*)
24 - use prefix && return 0 ;;
25 + use prefix && return 0
26 + use split-usr || return 0
27 + ;;
28 *) return 0 ;;
29 esac
30
31 --
32 2.22.0