commit: 335b399e38f34ed16dd59d40f1345dce03a04f54 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Apr 8 16:01:14 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Apr 8 16:15:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335b399e
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 <AT> gentoo.org> .../min-cscope/files/min-cscope-16.1.0-tinfo.patch | 33 ++++++++++++++++++++++ dev-util/min-cscope/min-cscope-16.1.0.ebuild | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch new file mode 100644 index 00000000000..4b7f86f9f2f --- /dev/null +++ b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch @@ -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}) diff --git a/dev-util/min-cscope/min-cscope-16.1.0.ebuild b/dev-util/min-cscope/min-cscope-16.1.0.ebuild index 9ae7cbca401..2648a185f32 100644 --- a/dev-util/min-cscope/min-cscope-16.1.0.ebuild +++ b/dev-util/min-cscope/min-cscope-16.1.0.ebuild @@ -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
