diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/iconv.mk | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk index fa7a4598ff2c..a0abf940122b 100644 --- a/Mk/Uses/iconv.mk +++ b/Mk/Uses/iconv.mk @@ -20,6 +20,8 @@ ICONV_LIB= -liconv ICONV_PREFIX= ${LOCALBASE} ICONV_CONFIGURE_ARG= --with-libiconv-prefix=${LOCALBASE} ICONV_CONFIGURE_BASE= --with-libiconv=${LOCALBASE} +ICONV_INCLUDE_PATH= ${LOCALBASE}/include +ICONV_LIB_PATH= ${LOCALBASE}/lib/libiconv.so .if ${iconv_ARGS:Mbuild} BUILD_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv @@ -36,6 +38,8 @@ ICONV_LIB= ICONV_PREFIX= /usr ICONV_CONFIGURE_ARG= ICONV_CONFIGURE_BASE= +ICONV_INCLUDE_PATH= /usr/include +ICONV_LIB_PATH= /usr/lib/libc.so .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \ || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \ @@ -45,8 +49,21 @@ CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG CXXFLAGS+= -DLIBICONV_PLUG OBJCFLAGS+= -DLIBICONV_PLUG +ICONV_INCLUDE_PATH= ${LOCALBASE}/include .endif .endif +# 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} + .endif |