commit:     4237139655a285835302c9d1282ae765ff511488
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 14:07:49 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 14:13:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42371396

app-emulation/ski: fix building w/ncurses[tinfo]

 .../ski/files/ski-1.3.2-ncurses-config.patch       | 25 ++++++++++++++++++++++
 app-emulation/ski/ski-1.3.2-r1.ebuild              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch 
b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
new file mode 100644
index 00000000..4317df4
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
@@ -0,0 +1,25 @@
+use pkg-config to look up ncurses deps to support things like split tinfo
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,6 +93,7 @@
+ AC_PROG_SED
+ AC_PROG_YACC
+ AM_PROG_LEX
++PKG_PROG_PKG_CONFIG
+ 
+ AC_C_INLINE
+ AC_C_CONST
+@@ -304,9 +305,9 @@
+ fi    
+ 
+ if test "x$check_curses" != xno; then
+-AC_CHECK_LIB(curses, tgetent, [],
+-    [AC_CHECK_LIB(ncurses, tgetent, ,
+-            [AC_MSG_ERROR(Required curses library not found.)])])
++    PKG_CHECK_MODULES([NCURSES], [ncurses])
++    CFLAGS="$CFLAGS $NCURSES_CFLAGS"
++    LIBS="$LIBS $NCURSES_LIBS"
+ fi
+ 
+ AC_CHECK_LIB(elf, elf_begin, [],

diff --git a/app-emulation/ski/ski-1.3.2-r1.ebuild 
b/app-emulation/ski/ski-1.3.2-r1.ebuild
index 4f40185..23d9c25 100644
--- a/app-emulation/ski/ski-1.3.2-r1.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-configure-withval.patch
        "${FILESDIR}"/${P}-binutils.patch
        "${FILESDIR}"/${P}-uselib.patch #592226
+       "${FILESDIR}"/${P}-ncurses-config.patch
 )
 
 src_prepare() {

Reply via email to