dev-util/min-cscope: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/678886
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
2019-04-08 18:01:14 +02:00
parent cbdaaf926b
commit 335b399e38
2 changed files with 38 additions and 1 deletions

View File

@@ -0,0 +1,33 @@
https://bugs.gentoo.org/678886
--- min-cscope/src/CMakeLists.txt
+++ min-cscope/src/CMakeLists.txt
@@ -15,7 +15,11 @@
# Curses interface
IF(NOT NO_CURSES)
CHECK_INCLUDE_FILES(ncurses.h HAVE_NCURSES)
+ if(HAVE_NCURSES)
+ set(CURSES_NEED_NCURSES TRUE)
+ endif(HAVE_NCURSES)
CHECK_INCLUDE_FILES(curses.h HAVE_CURSES)
+ find_package(Curses REQUIRED)
IF(HAVE_NCURSES OR HAVE_CURSES)
MESSAGE("Building with curses-based interface")
SET(MIN_CSCOPE_SRCS ${MIN_CSCOPE_SRCS} command.c edit.c help.c mouse.c)
@@ -137,13 +141,9 @@
IF(WIN32)
SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} regex)
ENDIF(WIN32)
-IF(HAVE_NCURSES)
- SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses)
-ELSE(HAVE_NCURSES)
- IF(HAVE_CURSES)
- SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses)
- ENDIF(HAVE_CURSES)
-ENDIF(HAVE_NCURSES)
+IF(HAVE_NCURSES OR HAVE_CURSES)
+ SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ${CURSES_LIBRARIES})
+ENDIF(HAVE_NCURSES OR HAVE_CURSES)
ADD_EXECUTABLE(min-cscope ${MIN_CSCOPE_SRCS})
TARGET_LINK_LIBRARIES(min-cscope ${MIN_CSCOPE_LIBS})

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,6 +18,10 @@ S=${WORKDIR}/${PN}
DOCS=( AUTHORS README{,.cscope} TODO )
PATCHES=(
"${FILESDIR}/${P}-tinfo.patch" #678886
)
src_prepare() {
cmake-utils_src_prepare