From 23aefa8f3d450e8cbb6bf21e190c1dbb16d2171f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Sroczy=C5=84ski?= <42609709+Mizzrym1@users.noreply.github.com> Date: Tue, 28 Jan 2020 19:06:38 +0100 Subject: libiconv - Fix ICONV_CONST --- ports/libiconv/CMakeLists.txt | 3 ++- ports/libiconv/CONTROL | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/libiconv/CMakeLists.txt b/ports/libiconv/CMakeLists.txt index 489b4750d..68fd49cc8 100644 --- a/ports/libiconv/CMakeLists.txt +++ b/ports/libiconv/CMakeLists.txt @@ -15,6 +15,7 @@ if(WIN32) set(USE_MBSTATE_T "0 /*USE_MBSTATE_T*/") set(BROKEN_WCHAR_H "0 /*BROKEN_WCHAR_H*/") set(HAVE_VISIBILITY "0 /*HAVE_VISIBILITY*/") + set(ICONV_CONST "const") configure_file(config.h.in config.h) file(READ "${CMAKE_CURRENT_BINARY_DIR}/config.h" _contents) @@ -22,7 +23,7 @@ if(WIN32) string(REPLACE "#undef HAVE_MBRTOWC" "#define HAVE_MBRTOWC 1" _contents "${_contents}") string(REPLACE "#undef HAVE_MBSINIT" "#define HAVE_MBSINIT 1" _contents "${_contents}") string(REPLACE "#undef HAVE_WCRTOMB" "#define HAVE_WCRTOMB 1" _contents "${_contents}") - string(REPLACE "#undef ICONV_CONST" "#define ICONV_CONST const" _contents "${_contents}") + string(REPLACE "#undef ICONV_CONST" "#define ICONV_CONST ${ICONV_CONST}" _contents "${_contents}") string(REPLACE "#undef EILSEQ" "" _contents "${_contents}") string(REPLACE "#undef WORDS_LITTLEENDIAN" "#define WORDS_LITTLEENDIAN 1" _contents "${_contents}") string(REPLACE "#undef ENABLE_RELOCATABLE" "#define ENABLE_RELOCATABLE 1" _contents "${_contents}") diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 33bb805d8..098a30bcc 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,4 +1,4 @@ Source: libiconv -Version: 1.16-1 +Version: 1.16-2 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion -- cgit v1.2.3 From 91d4020c9bd212c5f75642e16becf3da02bed6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Sroczy=C5=84ski?= Date: Thu, 13 Feb 2020 20:55:33 +0100 Subject: Remove "const" from the second argument of "iconv" --- ports/libiconv/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libiconv/CMakeLists.txt b/ports/libiconv/CMakeLists.txt index 68fd49cc8..43d55c0c3 100644 --- a/ports/libiconv/CMakeLists.txt +++ b/ports/libiconv/CMakeLists.txt @@ -15,7 +15,7 @@ if(WIN32) set(USE_MBSTATE_T "0 /*USE_MBSTATE_T*/") set(BROKEN_WCHAR_H "0 /*BROKEN_WCHAR_H*/") set(HAVE_VISIBILITY "0 /*HAVE_VISIBILITY*/") - set(ICONV_CONST "const") + set(ICONV_CONST "") configure_file(config.h.in config.h) file(READ "${CMAKE_CURRENT_BINARY_DIR}/config.h" _contents) -- cgit v1.2.3