[gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/

[Mike Frysinger]

commit:     912dfbf3095a5087982364d5813b3ebdc03c4cf7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 08:48:41 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 10:09:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912dfbf3

sys-libs/ncurses: use libgpm.so.1 all the time #544828

Since the gpm code relies on running ldd on the linked file in order to
calculate the SONAME, and we're passing this in as a configure flag some
of the time, just change the code to always pass it in.  This stabilizes
behavior across cross-compiling/multilib/ldd output/etc...  Relying on
ldd output in general is bad juju.

 sys-libs/ncurses/ncurses-5.9-r3.ebuild | 5 +++--
 sys-libs/ncurses/ncurses-5.9-r4.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
index 1803834..59540d4 100644
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
@@ -98,8 +98,9 @@ do_configure() {
                $(use_with cxx cxx-binding)
                $(use_with debug)
                $(use_with profile)
-               $(use_with gpm)
-               $(multilib_is_native_abi || use_with gpm gpm libgpm.so.1)
+               # The configure script uses ldd to parse the linked output which
+               # is flaky for cross-compiling/multilib/ldd versions/etc...
+               $(use_with gpm gpm libgpm.so.1)
                --disable-termcap
                --enable-symlinks
                --with-rcs-ids

diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
index e4553aa..2d241b1 100644
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
@@ -100,8 +100,9 @@ do_configure() {
                $(use_with cxx cxx-binding)
                $(use_with debug)
                $(use_with profile)
-               $(use_with gpm)
-               $(multilib_is_native_abi || use_with gpm gpm libgpm.so.1)
+               # The configure script uses ldd to parse the linked output which
+               # is flaky for cross-compiling/multilib/ldd versions/etc...
+               $(use_with gpm gpm libgpm.so.1)
                --disable-termcap
                --enable-symlinks
                --with-rcs-ids