From 3367e55463a0e2a9008c9b5445583efe1be7f93c Mon Sep 17 00:00:00 2001 From: Hleb Valoshka <375gnu@gmail.com> Date: Wed, 15 Jan 2020 23:14:24 +0300 Subject: [gettext] Add dependency on iconv (#9610) Closes: #8484 --- ports/gettext/CMakeLists.txt | 4 ++-- ports/gettext/CONTROL | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt index 1ec9aa285..67e1d05f7 100644 --- a/ports/gettext/CMakeLists.txt +++ b/ports/gettext/CMakeLists.txt @@ -102,7 +102,7 @@ if(BUILD_SHARED_LIBS) endif() add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY") -add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -D_CRT_SECURE_NO_WARNINGS") +add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -DHAVE_ICONV -DHAVE_ICONV_H -DICONV_CONST=const -D_CRT_SECURE_NO_WARNINGS") add_library(libintl ${SOURCES}) target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) @@ -147,4 +147,4 @@ include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-targets.cmake) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake DESTINATION share/unofficial-gettext -) \ No newline at end of file +) diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index 1816f8b76..a2876ee99 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,5 +1,5 @@ Source: gettext -Version: 0.19-11 +Version: 0.19-12 Homepage: https://www.gnu.org/software/gettext/ Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl. Build-Depends: libiconv -- cgit v1.2.3