diff options
| author | Maciej Sroczyński <42609709+Mizzrym1@users.noreply.github.com> | 2020-01-28 19:06:38 +0100 |
|---|---|---|
| committer | Maciej Sroczyński <macieksroczynski@poczta.fm> | 2020-02-04 01:01:43 +0100 |
| commit | 23aefa8f3d450e8cbb6bf21e190c1dbb16d2171f (patch) | |
| tree | ba7e6ad23a6812705f4ead031e1715225f8db213 | |
| parent | 85bf9d9d792e379e973d66c8af9f39d65d1d6d42 (diff) | |
| download | vcpkg-23aefa8f3d450e8cbb6bf21e190c1dbb16d2171f.tar.gz vcpkg-23aefa8f3d450e8cbb6bf21e190c1dbb16d2171f.zip | |
libiconv - Fix ICONV_CONST
| -rw-r--r-- | ports/libiconv/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | 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 |