diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-09-03 15:44:13 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-09-03 15:44:13 +0000 |
| commit | f358732b18188c53c785bb25749c9e2546a6efe9 (patch) | |
| tree | 05f83f4626cc97a41e5a29dca71409286f46ae35 /irc/weechat-devel | |
| parent | f8ac405eb53d03a5b0bb00134ceb82a6474b6743 (diff) | |
| download | ports-f358732b18188c53c785bb25749c9e2546a6efe9.tar.gz ports-f358732b18188c53c785bb25749c9e2546a6efe9.zip | |
Notes
Diffstat (limited to 'irc/weechat-devel')
| -rw-r--r-- | irc/weechat-devel/Makefile | 3 | ||||
| -rw-r--r-- | irc/weechat-devel/files/patch-cmake-FindIconv.cmake | 65 |
2 files changed, 10 insertions, 58 deletions
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile index 7d42b407ea47..fb35a7134a1a 100644 --- a/irc/weechat-devel/Makefile +++ b/irc/weechat-devel/Makefile @@ -22,7 +22,8 @@ CONFLICTS= weechat-0.3* USE_LDCONFIG= yes USES= cmake iconv ncurses -CMAKE_ARGS+= -DENABLE_GUILE=no +CMAKE_ARGS+= -DENABLE_GUILE=no \ + -DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib GITDESC= v0.4.3-14-gc324610 diff --git a/irc/weechat-devel/files/patch-cmake-FindIconv.cmake b/irc/weechat-devel/files/patch-cmake-FindIconv.cmake index a40e3d92ff8a..eef7422b85cc 100644 --- a/irc/weechat-devel/files/patch-cmake-FindIconv.cmake +++ b/irc/weechat-devel/files/patch-cmake-FindIconv.cmake @@ -1,63 +1,14 @@ ---- cmake/FindIconv.cmake.orig 2014-02-13 15:09:35 UTC +--- cmake/FindIconv.cmake +++ cmake/FindIconv.cmake -@@ -33,39 +33,24 @@ IF(ICONV_FOUND) - set(ICONV_FIND_QUIETLY TRUE) - ENDIF(ICONV_FOUND) - --INCLUDE(CheckLibraryExists) - INCLUDE(CheckFunctionExists) - --FIND_PATH(ICONV_INCLUDE_PATH -- NAMES iconv.h -- PATHS /usr/include /usr/local/include /usr/pkg/include --) -- --FIND_LIBRARY(ICONV_LIBRARY -- NAMES iconv -- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib --) -+FIND_PATH(ICONV_INCLUDE_PATH iconv.h) +@@ -48,9 +48,8 @@ find_library(ICONV_LIBRARY IF(ICONV_INCLUDE_PATH) -- IF(ICONV_LIBRARY) + IF(ICONV_LIBRARY) - STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}") - CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND) - CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND) -- IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND) -- SET(ICONV_FOUND TRUE) -- ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND) -- ELSE(ICONV_LIBRARY) -- CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND) -- ENDIF(ICONV_LIBRARY) -+ CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND) -+ IF(NOT ICONV_FOUND) -+ FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv libiconv-2) -+ IF(ICONV_LIBRARY) -+ SET(ICONV_FOUND TRUE) -+ ENDIF(ICONV_LIBRARY) -+ ENDIF(NOT ICONV_FOUND) - ENDIF(ICONV_INCLUDE_PATH) - - include(CheckCSourceCompiles) - --IF(ICONV_LIBRARY) -- SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) -- SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH}) --ENDIF(ICONV_LIBRARY) -- -+SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) -+SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH}) - SET(CMAKE_REQUIRED_FLAGS -Werror) - check_c_source_compiles(" - #include <iconv.h> -@@ -79,6 +64,10 @@ check_c_source_compiles(" - return 0; - } - " ICONV_2ARG_IS_CONST) -+SET(CMAKE_REQUIRED_LIBRARIES) -+SET(CMAKE_REQUIRED_INCLUDES) -+SET(CMAKE_REQUIRED_FLAGS) -+ - MARK_AS_ADVANCED( - ICONV_INCLUDE_PATH - ICONV_LIBRARY ++ CHECK_LIBRARY_EXISTS("${ICONV_LIBRARY}" libiconv_open "" LIBICONV_OPEN_FOUND) ++ CHECK_LIBRARY_EXISTS("${ICONV_LIBRARY}" iconv_open "" ICONV_OPEN_FOUND) + IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND) + SET(ICONV_FOUND TRUE) + ENDIF() |