diff options
| author | David HoĢppner | 2009-10-06 14:01:51 +0200 |
|---|---|---|
| committer | Max Howell | 2009-10-09 00:13:24 +0100 |
| commit | 0c021f7e4b5da446cefddfcd48a4b6e610559393 (patch) | |
| tree | da05a72a78745f194e090230906a39b91eec3d81 | |
| parent | f1982bf124b6602da95762c2e4edd315678301b6 (diff) | |
| download | homebrew-0c021f7e4b5da446cefddfcd48a4b6e610559393.tar.bz2 | |
weechat: fix iconv not found (not perfect)
Signed-off-by: Max Howell <max@methylblue.com>
Fixes #82
| -rw-r--r-- | Library/Formula/weechat.rb | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb index b248cf494..db802b042 100644 --- a/Library/Formula/weechat.rb +++ b/Library/Formula/weechat.rb @@ -8,6 +8,10 @@ class Weechat <Formula depends_on 'cmake' depends_on 'gnutls' + def patches + DATA + end + def install #FIXME: Compiling perl module doesn't work #FIXME: GnuTLS support isn't detected @@ -18,3 +22,34 @@ class Weechat <Formula system "make install" end end + +__END__ +diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake +index a7b2d24..371d630 100644 +--- a/cmake/FindIconv.cmake ++++ b/cmake/FindIconv.cmake +@@ -43,10 +43,7 @@ FIND_LIBRARY(ICONV_LIBRARY + IF(ICONV_INCLUDE_PATH) + IF(ICONV_LIBRARY) + STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}") +- CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND) +- IF(NOT ICONV_FOUND) +- CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND) +- ENDIF(NOT ICONV_FOUND) ++ CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND) + ELSE(ICONV_LIBRARY) + CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND) + ENDIF(ICONV_LIBRARY) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 50d2f01..f812c74 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -92,6 +92,7 @@ ENDIF(NOT DISABLE_GNUTLS) + FIND_PACKAGE(Iconv) + IF(ICONV_FOUND) + ADD_DEFINITIONS( -DHAVE_ICONV ) ++ LIST(APPEND EXTRA_LIBS iconv) + ENDIF(ICONV_FOUND) + + FIND_LIBRARY(DL_LIBRARY + |