diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-09-06 18:23:09 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-09-06 18:23:09 +0000 |
| commit | 8faa5bb6b527e9d6334c0315325953bae8c31533 (patch) | |
| tree | 4a5a8f7a7906547ba5e1cefcce6839770535e69f /databases/tarantool/files | |
| parent | - Update to 0.20180904 (diff) | |
Update to 1.9.2
Changes: https://github.com/tarantool/tarantool/releases
Notes
Notes:
svn path=/head/; revision=479115
Diffstat (limited to 'databases/tarantool/files')
| -rw-r--r-- | databases/tarantool/files/patch-cmake-FindICONV.cmake | 18 | ||||
| -rw-r--r-- | databases/tarantool/files/patch-src-CMakeLists.txt | 15 |
2 files changed, 18 insertions, 15 deletions
diff --git a/databases/tarantool/files/patch-cmake-FindICONV.cmake b/databases/tarantool/files/patch-cmake-FindICONV.cmake new file mode 100644 index 000000000000..ee19d1bda426 --- /dev/null +++ b/databases/tarantool/files/patch-cmake-FindICONV.cmake @@ -0,0 +1,18 @@ +--- cmake/FindICONV.cmake.orig 2018-09-06 16:31:05 UTC ++++ cmake/FindICONV.cmake +@@ -4,14 +4,8 @@ + # ICONV_LIBRARIES + # + +-if (TARGET_OS_LINUX) ++if (TARGET_OS_FREEBSD OR TARGET_OS_LINUX) + set(ICONV_LIBRARY "") +-else() +- find_library(ICONV_LIBRARY iconv) +- if(NOT ICONV_LIBRARY) +- message(WARNING "iconv library not found") +- set(ICONV_LIBRARY "") +- endif() + endif() + find_path(ICONV_INCLUDE_DIR iconv.h) + if(NOT ICONV_INCLUDE_DIR) diff --git a/databases/tarantool/files/patch-src-CMakeLists.txt b/databases/tarantool/files/patch-src-CMakeLists.txt deleted file mode 100644 index 85338e2e920b..000000000000 --- a/databases/tarantool/files/patch-src-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- src/CMakeLists.txt.orig 2018-05-14 06:50:08 UTC -+++ src/CMakeLists.txt -@@ -234,12 +234,6 @@ if (TARGET_OS_FREEBSD AND NOT TARGET_OS_ - else() - set (common_libraries ${common_libraries} ${INTL}) - endif() -- find_library (ICONV iconv) -- if (NOT ICONV) -- message(FATAL_ERROR "iconv library not found") -- else() -- set (common_libraries ${common_libraries} ${ICONV}) -- endif() - endif() - - set (common_libraries ${common_libraries} ${LIBUUID_LIBRARIES}) |