Skip to content

Commit db81840

Browse files
committed
Disable bogus code for finding and linking against ncurses.
For some very old reason lost in the dawn of time, HHVM imported the CMake file of Readline from KDE, which had an ncurses dependency. Remove it from everywhere. Sync with Debian patch 08_disable_libncurses.patch from 2.4.1-1.
1 parent 2bd460c commit db81840

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

CMake/FindNcurses.cmake

Lines changed: 0 additions & 23 deletions
This file was deleted.

CMake/FindReadline.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# --> BSD licensed
44
#
55
# GNU Readline library finder
6-
if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
6+
if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
77
set(READLINE_FOUND TRUE)
8-
else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
8+
else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
99
FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
1010
/usr/include/readline
1111
)
@@ -26,4 +26,4 @@ else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
2626
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY )
2727

2828
MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
29-
endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
29+
endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)

CMake/HPHPFindLibs.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,6 @@ include_directories(${ONIGURUMA_INCLUDE_DIRS})
295295
find_package(Ldap REQUIRED)
296296
include_directories(${LDAP_INCLUDE_DIR})
297297

298-
# ncurses, readline and history
299-
#set(CURSES_NEED_NCURSES true)
300-
find_package(Ncurses REQUIRED)
301-
include_directories(${NCURSES_INCLUDE_PATH})
302-
303298
# libpthreads
304299
find_package(PThread REQUIRED)
305300
include_directories(${LIBPTHREAD_INCLUDE_DIRS})
@@ -532,7 +527,6 @@ endif()
532527
target_link_libraries(${target} ${EDITLINE_LIBRARIES})
533528
endif()
534529

535-
target_link_libraries(${target} ${NCURSES_LIBRARY})
536530
target_link_libraries(${target} ${CCLIENT_LIBRARY})
537531

538532
if (PAM_LIBRARY)

0 commit comments

Comments
 (0)