summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2017-01-19 08:07:49 -0600
committerMike Frysinger <vapier@gentoo.org>2017-01-19 08:13:37 -0600
commit4237139655a285835302c9d1282ae765ff511488 (patch)
tree0e543226341508ec94fe539af68b36bad955c59c /app-emulation/ski
parentapp-emulation/ski: update EAPI to use subslots (diff)
downloadgentoo-4237139655a285835302c9d1282ae765ff511488.tar.gz
gentoo-4237139655a285835302c9d1282ae765ff511488.tar.bz2
gentoo-4237139655a285835302c9d1282ae765ff511488.zip
app-emulation/ski: fix building w/ncurses[tinfo]
Diffstat (limited to 'app-emulation/ski')
-rw-r--r--app-emulation/ski/files/ski-1.3.2-ncurses-config.patch25
-rw-r--r--app-emulation/ski/ski-1.3.2-r1.ebuild1
2 files changed, 26 insertions, 0 deletions
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 000000000000..4317df415efa
--- /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 4f401856f947..23d9c253841c 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() {