IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6777 from justinmk/bsd

Browse Source
This commit is contained in:
Justin M. Keyes 2017-05-28 02:37:07 +02:00 committed by GitHub
commit 1cf377f23a
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -228,7 +228,7 @@ else()
# On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang # On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang
# 3.4.1 used there. # 3.4.1 used there.
if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
add_definitions(-Wno-c11-extensions) add_definitions(-Wno-c11-extensions)
endif() endif()
endif() endif()
@ -456,7 +456,6 @@ include(InstallHelpers)
file(GLOB MANPAGES file(GLOB MANPAGES
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
man/nvim.1) man/nvim.1)
install_helper( install_helper(
FILES ${MANPAGES} FILES ${MANPAGES}
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

9
cmake/InstallHelpers.cmake
View File

@ -1,3 +1,12 @@
# Fix CMAKE_INSTALL_MANDIR on BSD before including GNUInstallDirs. #6771
if(CMAKE_SYSTEM_NAME MATCHES "BSD" AND NOT DEFINED CMAKE_INSTALL_MANDIR)
if(DEFINED ENV{MANPREFIX})
set(CMAKE_INSTALL_MANDIR "$ENV{MANPREFIX}/man")
else()
set(CMAKE_INSTALL_MANDIR "/usr/local/man")
endif()
endif()
# For $CMAKE_INSTALL_{DATAROOT,MAN, ...}DIR # For $CMAKE_INSTALL_{DATAROOT,MAN, ...}DIR
include(GNUInstallDirs) include(GNUInstallDirs)

2
src/nvim/os/pty_process_unix.c
View File

@ -12,7 +12,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
// forkpty is not in POSIX, so headers are platform-specific // forkpty is not in POSIX, so headers are platform-specific
#if defined(__FreeBSD__) #if defined(__FreeBSD__) || defined (__DragonFly__)
# include <libutil.h> # include <libutil.h>
#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
# include <util.h> # include <util.h>