diff options
| author | maya <maya@pkgsrc.org> | 2017-11-04 17:16:58 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-11-04 17:16:58 +0000 |
| commit | 87b552c7f604ea2085a64bb39b705c2c66d5ddab (patch) | |
| tree | d9c1d5ac8e0aa09d4f6598b0c057b9618e884d7f | |
| parent | 4c82283100e45de813c942030c2147648ca18964 (diff) | |
| download | pkgsrc-87b552c7f604ea2085a64bb39b705c2c66d5ddab.tar.gz | |
weechat: add configure check that eat_newline_glitch can be assigned to
Fixes netbsd-7 build.
| -rw-r--r-- | chat/weechat/distinfo | 3 | ||||
| -rw-r--r-- | chat/weechat/patches/patch-CMakeLists.txt | 48 |
2 files changed, 50 insertions, 1 deletions
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo index 1812e5f7fd5..df9f16a0f29 100644 --- a/chat/weechat/distinfo +++ b/chat/weechat/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.44 2017/09/25 12:14:28 maya Exp $ +$NetBSD: distinfo,v 1.45 2017/11/04 17:16:58 maya Exp $ SHA1 (weechat-1.9.1.tar.bz2) = caebc05c4a8627625d2688534fbba624555e5a8e RMD160 (weechat-1.9.1.tar.bz2) = ea3e14d979c94fa5554f057ea210f0021abcb28d SHA512 (weechat-1.9.1.tar.bz2) = dd535845b61430be212c973deab745d5829ef46971c84118e14689073f3d83bcbc1d85856e3e5110b78efb6ee6ccf64201bb6b77573a295aa9dc7f5d1dab3d3e Size (weechat-1.9.1.tar.bz2) = 2658824 bytes +SHA1 (patch-CMakeLists.txt) = b3c4c6baa5898099e4448be4384437766f344cf2 SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b diff --git a/chat/weechat/patches/patch-CMakeLists.txt b/chat/weechat/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..f1dc3d374e2 --- /dev/null +++ b/chat/weechat/patches/patch-CMakeLists.txt @@ -0,0 +1,48 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2017/11/04 17:16:58 maya Exp $ + +--- CMakeLists.txt.orig 2017-09-23 11:08:45.000000000 +0000 ++++ CMakeLists.txt +@@ -25,7 +25,7 @@ project(weechat C) + + # CMake options + set(CMAKE_VERBOSE_MAKEFILE OFF) +-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) ++set (CMAKE_MODULE_PATH "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) + set(CMAKE_SKIP_RPATH ON) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") + set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") +@@ -150,7 +150,33 @@ check_include_files("sys/resource.h" HAV + + check_function_exists(mallinfo HAVE_MALLINFO) + +-check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH) ++include(CheckCSourceCompiles) ++find_package(Ncurses) ++check_include_files(ncursesw/term.h HAVE_NCURSESW_TERM_H) ++check_include_files(ncurses/term.h HAVE_NCURSES_TERM_H) ++ ++ ++set(OLD_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") ++ ++if(NCURSES_FOUND) ++ set(CMAKE_REQUIRED_LIBRARIES "ncurses") ++else() ++ set(CMAKE_REQUIRED_LIBRARIES "curses") ++endif() ++ ++CHECK_C_SOURCE_COMPILES(" ++ #ifdef HAVE_NCURSES_TERM_H ++ #include <ncurses/term.h> ++ #endif ++ #include <term.h> ++ ++ int main() { ++ eat_newline_glitch = 1; ++ return 0; ++ } ++ " HAVE_EAT_NEWLINE_GLITCH) ++ ++set(CMAKE_REQUIRED_LIBRARIES "${OLD_CMAKE_REQUIRED_LIBRARIES}") + + # Check for Large File Support + if(ENABLE_LARGEFILE) |