dev-libs/libedit: Fix building with ncurses[tinfo]

This commit is contained in:
Michał Górny
2017-06-12 21:41:18 +02:00
parent e6ffdb6a7e
commit decac89bab
2 changed files with 37 additions and 1 deletions

View File

@@ -0,0 +1,30 @@
From 7aa660fd9d446567d3280765ba2a50a46b2a9159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 12 Jun 2017 21:36:54 +0200
Subject: [PATCH] configure: Support -ltinfo as split in newer ncurses
The newer versions of ncurses support building terminfo routines
as a split -ltinfo library. Account for that by adding this library
to the search list.
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 9a571b2..5d714b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,9 @@ EL_MANTYPE
AC_CHECK_LIB(ncurses, tgetent,,
[AC_CHECK_LIB(curses, tgetent,,
[AC_CHECK_LIB(termcap, tgetent,,
- [AC_MSG_ERROR([libncurses, libcurses, or libtermcap is required!])]
+ [AC_CHECK_LIB(tinfo, tgetent,,
+ [AC_MSG_ERROR([libncurses, libcurses, libtermcap or libtinfo is required!])]
+ )]
)]
)]
)
--
2.13.1

View File

@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit multilib-minimal toolchain-funcs
inherit autotools multilib-minimal toolchain-funcs
MY_PV=${PV/./-}
MY_P=${PN}-${MY_PV}
@@ -26,8 +26,14 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${P}-ncursesprivate.patch"
"${FILESDIR}/${P}-el_fn_sh_complete.patch"
"${FILESDIR}/${P}-tinfo.patch"
)
src_prepare() {
default
eautoreconf
}
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable static-libs static) \