From 838c3028555eb9d8f12017dcf43f0c7b0c8af90f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 30 Mar 2016 17:56:57 -0400 Subject: toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi support #479448 Many ebuilds have started checking multilib_is_native_abi to see if they should call gen_usr_ldscript. Since that logic always makes sense, add it directly to the gen_usr_ldscript function. --- sys-libs/ncurses/ncurses-5.9-r3.ebuild | 2 +- sys-libs/ncurses/ncurses-5.9-r4.ebuild | 2 +- sys-libs/ncurses/ncurses-5.9-r5.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys-libs/ncurses') diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild index be2a9bd3d433..0f383d51d910 100644 --- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild @@ -180,7 +180,7 @@ multilib_src_install() { fi # Move libncurses{,w} into /lib - multilib_is_native_abi && gen_usr_ldscript -a \ + gen_usr_ldscript -a \ ncurses \ $(usex unicode 'ncursesw' '') \ $(use tinfo && usex unicode 'tinfow' '') \ diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild index 78abd8707422..ea8dacf4145e 100644 --- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild @@ -185,7 +185,7 @@ multilib_src_install() { fi # Move libncurses{,w} into /lib - multilib_is_native_abi && gen_usr_ldscript -a \ + gen_usr_ldscript -a \ ncurses \ $(usex unicode 'ncursesw' '') \ $(use tinfo && usex unicode 'tinfow' '') \ diff --git a/sys-libs/ncurses/ncurses-5.9-r5.ebuild b/sys-libs/ncurses/ncurses-5.9-r5.ebuild index 33f97d44187d..698ed64e95b5 100644 --- a/sys-libs/ncurses/ncurses-5.9-r5.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r5.ebuild @@ -187,7 +187,7 @@ multilib_src_install() { fi # Move libncurses{,w} into /lib - multilib_is_native_abi && gen_usr_ldscript -a \ + gen_usr_ldscript -a \ ncurses \ $(usex unicode 'ncursesw' '') \ $(use tinfo && usex unicode 'tinfow' '') \ -- cgit v1.2.3-65-gdbad