mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
sys-apps/pick: fix building against ncurses with split out libtinfo
Closes: https://bugs.gentoo.org/630864
This commit is contained in:
24
sys-apps/pick/files/pick-1.8.0-tinfo.patch
Normal file
24
sys-apps/pick/files/pick-1.8.0-tinfo.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
Use pkg-config to determine ncurses libs and cflags to use. Fixes when building
|
||||
against ncurses with libtinfo split out.
|
||||
|
||||
--- pick-1.8.0/configure.ac
|
||||
+++ pick-1.8.0/configure.ac
|
||||
@@ -5,13 +5,10 @@
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AC_CHECK_FUNCS([pledge reallocarray strtonum])
|
||||
-AC_SEARCH_LIBS([setupterm], [curses], [],
|
||||
- [
|
||||
- AC_SEARCH_LIBS([setupterm], [ncursesw],
|
||||
- [AC_DEFINE([HAVE_NCURSESW_H], [1], [Define if ncursesw is available])],
|
||||
- [AC_MSG_ERROR([unable to find setupterm function])]
|
||||
- )
|
||||
- ]
|
||||
-)
|
||||
+PKG_CHECK_MODULES([NCURSES], [ncursesw],
|
||||
+ [AC_DEFINE([HAVE_NCURSESW_H], [1], [Define if ncursesw is available])],
|
||||
+ [PKG_CHECK_MODULES([NCURSES], [ncurses])])
|
||||
+CFLAGS="$CFLAGS $NCURSES_CFLAGS"
|
||||
+LIBS="$LIBS $NCURSES_LIBS"
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
@@ -14,10 +14,14 @@ SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="sys-libs/ncurses:0="
|
||||
RDEPEND="${DEPEND}"
|
||||
RDEPEND="sys-libs/ncurses:0="
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-cflags.patch
|
||||
"${FILESDIR}"/${P}-tinfo.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
Reference in New Issue
Block a user