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 /chinese | |
| parent | Fix build on i386-9.3. (diff) | |
Uses/iconv.mk: Set iconv-related CMake variables.
The way we deal with iconv in base and ports across different FreeBSD
releases is complicated: 9.x does not have iconv.h in base, 10.1 has it with
a different prototype for iconv(3) and later versions have the right
iconv(3) prototype. And, in some cases (USES=iconv:{translit,wchar_t}), we
must always use the libiconv port.
This is why there are so many checks in Uses/iconv.mk: we need to know the
situation we currently have in order to decide whether to pull iconv from
converters/libiconv, whether to just use its header (and pull the library
from base) or whether to use everything from base.
r384038 adjusted several CMake-based ports, but did so in a way that was not
very scalable and required a few intrusive patches to some ports. Most ports
that have both USES=cmake and USES=iconv use variations of FindIconv.cmake
that behave similarly. This change passes the header and library values we
really want to use to CMake using the most common variable names, bypassing
the calls to find_path() and find_library() that would sometimes end up
finding the wrong file. The few ports that use different variable names have
had their Makefiles adjusted (we manually pass the values we want via
CMAKE_ARGS).
Other changes:
- chinese/fcitx: Explicitly set LIBICONV_LIBC_HAS_ICONV_OPEN=OFF as we
always want the version from ports because of USES=iconv:wchar_t.
- editors/calligra: Explicitly use iconv:translit because Kexi needs it.
- irc/weechat and irc/weechat-devel: The FindIconv.cmake patches could not
be entirely removed because the check_library_exists() calls are wrong.
Sent upstream: https://github.com/weechat/weechat/pull/513
- textproc/ctpp2: Use iconv:translit when the TRANSLITERATE option is used.
PORTREVISION has been bumped in editors/calligra and textproc/ctpp2 because
their dependency list has changed in 10.2 and later as the ports version is
always used now.
PR: 202798
Reviewed by: antoine, tijl
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=395972
Diffstat (limited to 'chinese')
| -rw-r--r-- | chinese/fcitx/Makefile | 1 | ||||
| -rw-r--r-- | chinese/fcitx/files/patch-cmake__FindLibiconv.cmake | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 9090d8ed900a..65f5c6641ee0 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -50,6 +50,7 @@ TPUNC_DESC= Use traditional quotation marks .include <bsd.port.options.mk> CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \ + -DLIBICONV_LIBC_HAS_ICONV_OPEN=OFF \ -DDATADIR=${DATADIR} \ -DDOCSDIR=${DOCSDIR} \ -DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \ diff --git a/chinese/fcitx/files/patch-cmake__FindLibiconv.cmake b/chinese/fcitx/files/patch-cmake__FindLibiconv.cmake deleted file mode 100644 index 5c90942bc345..000000000000 --- a/chinese/fcitx/files/patch-cmake__FindLibiconv.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/FindLibiconv.cmake.orig 2015-04-03 02:44:55.321687654 +0000 -+++ cmake/FindLibiconv.cmake 2015-04-03 02:46:05.734216729 +0000 -@@ -30,7 +30,7 @@ set(LIBICONV_LIB_FOUND FALSE) - - if(LIBICONV_INCLUDE_DIR) - include(CheckFunctionExists) -- check_function_exists(iconv_open LIBICONV_LIBC_HAS_ICONV_OPEN) -+ set(LIBICONV_LIBC_HAS_ICONV_OPEN FALSE) - - if (LIBICONV_LIBC_HAS_ICONV_OPEN) - set(LIBICONV_LIBRARIES) |