diff options
author | 2014-05-06 21:12:43 +0000 | |
---|---|---|
committer | 2014-05-06 21:12:43 +0000 | |
commit | ec542b59752ae488d1708ed6d4e0bf65d7c2f1b6 (patch) | |
tree | 6a7e9a21261e218a790f510aae1b6589a0045709 /dev-util/cmake/files | |
parent | Version bump. Cleanup old. (diff) | |
download | historical-ec542b59752ae488d1708ed6d4e0bf65d7c2f1b6.tar.gz historical-ec542b59752ae488d1708ed6d4e0bf65d7c2f1b6.tar.bz2 historical-ec542b59752ae488d1708ed6d4e0bf65d7c2f1b6.zip |
Add patch to fix build with sys-libs/ncurses[tinfo] by Mark Wright <gienah@gentoo.org>, bug #468622.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'dev-util/cmake/files')
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch new file mode 100644 index 000000000000..43a2a7f4a2f0 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch @@ -0,0 +1,42 @@ +--- cmake-2.8.12.1-orig/Modules/FindCurses.cmake 2013-11-06 06:07:22.000000000 +1100 ++++ cmake-2.8.12.1/Modules/FindCurses.cmake 2014-01-17 21:55:40.630142386 +1100 +@@ -30,7 +30,7 @@ + find_library(CURSES_NCURSES_LIBRARY NAMES ncurses ) + set(CURSES_USE_NCURSES FALSE) + +-if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY) ++if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) + set(CURSES_USE_NCURSES TRUE) + endif() + # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html +@@ -125,10 +125,20 @@ + CACHE FILEPATH "The curses library" ${FORCE_IT}) + endif() + ++ CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" ++ cbreak "" CURSES_NCURSES_HAS_CBREAK) ++ if(NOT CURSES_NCURSES_HAS_CBREAK) ++ find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}") ++ find_library(CURSES_EXTRA_LIBRARY tinfo ) ++ CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}" ++ cbreak "" CURSES_TINFO_HAS_CBREAK) ++ endif() + endif() + +-find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") +-find_library(CURSES_EXTRA_LIBRARY cur_colr ) ++if (NOT CURSES_TINFO_HAS_CBREAK) ++ find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") ++ find_library(CURSES_EXTRA_LIBRARY cur_colr ) ++endif() + + find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") + find_library(CURSES_FORM_LIBRARY form ) +@@ -172,5 +182,7 @@ + CURSES_INCLUDE_DIR + CURSES_CURSES_HAS_WSYNCUP + CURSES_NCURSES_HAS_WSYNCUP ++ CURSES_NCURSES_HAS_CBREAK ++ CURSES_TINFO_HAS_CBREAK + ) + |