kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/Mk/Uses/iconv.mk

71 lines
2.1 KiB
Makefile
Raw Normal View History

Introduces USES= iconv to replace USE_ICONV. It takes no arguments. This deprecates USE_ICONV, please convert your ports. USE_ICONV will be removed as soon as it is no more used in the ports tree. Approved by: portmgr (bapt)
2013-04-26 22:44:59 +02:00
# $FreeBSD$
#
# handle dependency on the iconv port
#
# Feature: iconv
1. Introduce using iconv with arguments: . lib (default, implicit); . build, . patch. The default is the same, all existing ports stay valid. 2. Introduce variable ICONV_CMD with default to ${LOCALBASE}/bin/iconv. It is intended to get the value of /usr/bin/iconv at recent 10.x. 3. Adopt all ports to using USES+= icomv:build and iconv:patch and change iconv (executable) at Makefile commands to ${ICONV_CMD} at those ports. Submitted by: bsam (me, via e-mail) Approved by: portmgr (bapt)
2013-09-02 07:41:50 +02:00
# Usage: USES=iconv or USES=iconv:ARGS
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
# Valid ARGS: lib (default, implicit), build, patch,
# wchar_t (port uses "WCHAR_T" extension),
# translit (port uses "//TRANSLIT" extension)
Move MAINTAINER lines to the end of the initial comment block and make things a bit more consistent. Approved by: portmgr (bapt)
2014-03-15 11:31:54 +01:00
#
# MAINTAINER: portmgr@FreeBSD.org
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
Introduces USES= iconv to replace USE_ICONV. It takes no arguments. This deprecates USE_ICONV, please convert your ports. USE_ICONV will be removed as soon as it is no more used in the ports tree. Approved by: portmgr (bapt)
2013-04-26 22:44:59 +02:00
.if !defined(_INCLUDE_USES_ICONV_MK)
_INCLUDE_USES_ICONV_MK= yes
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
.if !exists(/usr/include/iconv.h) || ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit}
- Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
2013-09-04 20:06:07 +02:00
ICONV_CMD= ${LOCALBASE}/bin/iconv
ICONV_LIB= -liconv
Introduce variable ICONV_PREFIX at Mk/Uses/iconv.mk. The default for pre 100043 is ${LOCALBASE} and /usr otherwise. Convert all ports to new variable usage. Approved by: portmgr (bapt, implicit)
2013-09-07 21:49:41 +02:00
ICONV_PREFIX= ${LOCALBASE}
- Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
2013-09-04 20:06:07 +02:00
ICONV_CONFIGURE_ARG= --with-libiconv-prefix=${LOCALBASE}
. introduce ICONV_CONFIGURE_BASE variable at Mk/Uses/iconv.mk. It's value is "--with-libiconv=${LOCALBASE}" at systems pre OSVERSION 100043 and "" (null) otherwise; . convert all ports which has CONFIGURE_ARGS=--with-libiconv=${LOCALBASE}. Approved by: portmgr (bapt, implicit)
2013-09-05 22:18:30 +02:00
ICONV_CONFIGURE_BASE= --with-libiconv=${LOCALBASE}
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)
2015-09-03 17:44:13 +02:00
ICONV_INCLUDE_PATH= ${LOCALBASE}/include
ICONV_LIB_PATH= ${LOCALBASE}/lib/libiconv.so
- Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
2013-09-04 20:06:07 +02:00
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
.if ${iconv_ARGS:Mbuild}
Remove the now unneeded ${PORTSDIR} from dependency definition in The infrastructure Makefiles PR: 206569 Exp run by: antoine Differential Revision: D5047
2016-03-27 03:23:25 +02:00
BUILD_DEPENDS+= ${ICONV_CMD}:converters/libiconv
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
.elif ${iconv_ARGS:Mpatch}
Remove the now unneeded ${PORTSDIR} from dependency definition in The infrastructure Makefiles PR: 206569 Exp run by: antoine Differential Revision: D5047
2016-03-27 03:23:25 +02:00
PATCH_DEPENDS+= ${ICONV_CMD}:converters/libiconv
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
.else
Remove the now unneeded ${PORTSDIR} from dependency definition in The infrastructure Makefiles PR: 206569 Exp run by: antoine Differential Revision: D5047
2016-03-27 03:23:25 +02:00
LIB_DEPENDS+= libiconv.so:converters/libiconv
1. Introduce using iconv with arguments: . lib (default, implicit); . build, . patch. The default is the same, all existing ports stay valid. 2. Introduce variable ICONV_CMD with default to ${LOCALBASE}/bin/iconv. It is intended to get the value of /usr/bin/iconv at recent 10.x. 3. Adopt all ports to using USES+= icomv:build and iconv:patch and change iconv (executable) at Makefile commands to ${ICONV_CMD} at those ports. Submitted by: bsam (me, via e-mail) Approved by: portmgr (bapt)
2013-09-02 07:41:50 +02:00
.endif
Introduces USES= iconv to replace USE_ICONV. It takes no arguments. This deprecates USE_ICONV, please convert your ports. USE_ICONV will be removed as soon as it is no more used in the ports tree. Approved by: portmgr (bapt)
2013-04-26 22:44:59 +02:00
- Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
2013-09-04 20:06:07 +02:00
.else
ICONV_CMD= /usr/bin/iconv
ICONV_LIB=
Introduce variable ICONV_PREFIX at Mk/Uses/iconv.mk. The default for pre 100043 is ${LOCALBASE} and /usr otherwise. Convert all ports to new variable usage. Approved by: portmgr (bapt, implicit)
2013-09-07 21:49:41 +02:00
ICONV_PREFIX= /usr
- Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
2013-09-04 20:06:07 +02:00
ICONV_CONFIGURE_ARG=
. introduce ICONV_CONFIGURE_BASE variable at Mk/Uses/iconv.mk. It's value is "--with-libiconv=${LOCALBASE}" at systems pre OSVERSION 100043 and "" (null) otherwise; . convert all ports which has CONFIGURE_ARGS=--with-libiconv=${LOCALBASE}. Approved by: portmgr (bapt, implicit)
2013-09-05 22:18:30 +02:00
ICONV_CONFIGURE_BASE=
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)
2015-09-03 17:44:13 +02:00
ICONV_INCLUDE_PATH= /usr/include
ICONV_LIB_PATH= /usr/lib/libc.so
- Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
2013-09-04 20:06:07 +02:00
Mk/Iconv.mk: Remove DragonFly exception This file has been locally patched in dports for over a year. The exception hasn't been valid since DragonFly 4.0. Approved by: erwin@ (portmgr)
2016-03-28 22:53:56 +02:00
.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
Use base system iconv.h again on FreeBSD stable/10.
2015-04-30 18:53:06 +02:00
|| (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
converters/libiconv: - Remove const qualifier from iconv(3) to match POSIX: http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html - Patch iconv.h to expose more GNU extensions when LIBICONV_PLUG is defined because the base system iconv supports these extensions too. Add/remove patches to/from ports to call iconv with non-const arguments. This breaks some ports on FreeBSD 10 because base system iconv.h still has the const qualifier. Fix this by letting USES=iconv add a build dependency on converters/libiconv so ports can use its iconv.h (with LIBICONV_PLUG defined) instead of the base system iconv.h. This exposed some ports that link with libiconv when it is available instead of using libc iconv. In these cases one of the following changes has been made: - patch configure scripts to test for libc iconv first - add ac_cv_lib_iconv_libiconv=no or similar to CONFIGURE_ARGS to disable some configure tests - converters/wkhtmltopdf: this includes Qt4 so add a patch from devel/qt4 - lang/gcc5-aux: respect CFLAGS and friends during configure such that LIBICONV_PLUG is defined in the iconv test, also switch to external gettext - mail/gnarwl: replace patches with CPPFLAGS/LIBS - multimedia/ffmpeg2theora: remove iconv test from SConstruct and use ICONV_LIB in port Makefile instead, also fix a bug in subtitles.c - net-im/licq: finish conversion to cmake - net-mgmt/bandwidthd, net-mgmt/icinga, net-mgmt/nagios, net-mgmt/nagios4: don't need iconv - textproc/p5-XML-TinyXML: finish conversion to USES=perl5 Other changes: - databases/qdbm and slaves: respect CFLAGS and friends, also enable bzip2 and lzo support - games/ldmud: respect CFLAGS and friends - graphics/inventor: replace some patches with MAKE_ARGS/MAKE_ENV to respect CFLAGS and friends, also remove FreeBSD/alpha patch and add missing xorg dependencies PR: 199099 Exp-run by: antoine Approved by: portmgr (antoine)
2015-04-15 10:20:27 +02:00
|| exists(${LOCALBASE}/include/iconv.h)
Remove the now unneeded ${PORTSDIR} from dependency definition in The infrastructure Makefiles PR: 206569 Exp run by: antoine Differential Revision: D5047
2016-03-27 03:23:25 +02:00
BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv
Always add -DLIBICONV_PLUG to CPPFLAGS and friends when the base system iconv(3) is used. Adding it only when LOCALBASE/include/iconv.h exists is not enough because this is tested before dependencies are installed and they may pull in converters/libiconv. PR: 209302 Exp-run by: antoine Approved by: portmgr (antoine)
2016-05-12 15:36:46 +02:00
ICONV_INCLUDE_PATH= ${LOCALBASE}/include
.endif
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
CPPFLAGS+= -DLIBICONV_PLUG
CFLAGS+= -DLIBICONV_PLUG
CXXFLAGS+= -DLIBICONV_PLUG
Update GNUstep ports to their latest versions. Also fix a few bits of generic infrastructure along the way. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D2961
2015-07-01 15:50:28 +02:00
OBJCFLAGS+= -DLIBICONV_PLUG
- Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust)
2014-01-29 21:24:49 +01:00
- Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
2013-09-04 20:06:07 +02:00
.endif
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)
2015-09-03 17:44:13 +02:00
# These are the most common names for the iconv-related variables found in
# CMake-based ports. We set them here via CMAKE_ARGS to make sure that the best
# combination is always used (ie. we prefer the version in libc whenever it is
# available, and sometimes have to fall back to the iconv.h header from ports
# while still using the library from base).
CMAKE_ARGS+= -DICONV_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \
-DICONV_LIBRARIES=${ICONV_LIB_PATH} \
-DICONV_LIBRARY=${ICONV_LIB_PATH} \
-DLIBICONV_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \
-DLIBICONV_LIBRARIES=${ICONV_LIB_PATH} \
-DLIBICONV_LIBRARY=${ICONV_LIB_PATH}
Introduces USES= iconv to replace USE_ICONV. It takes no arguments. This deprecates USE_ICONV, please convert your ports. USE_ICONV will be removed as soon as it is no more used in the ports tree. Approved by: portmgr (bapt)
2013-04-26 22:44:59 +02:00
.endif
Reference in a new issue Copy permalink