diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-05-07 14:20:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 14:20:52 -0700 |
| commit | 2e2c07338f13ca358e6cdf1f589f23a1f8df91ae (patch) | |
| tree | 4ba9412d2ae2a22318ad0d7621f587f80d68dee1 | |
| parent | d7d410b50bce43ec28699e6fa86f066a3eeceeb4 (diff) | |
| parent | 91d4020c9bd212c5f75642e16becf3da02bed6e7 (diff) | |
| download | vcpkg-2e2c07338f13ca358e6cdf1f589f23a1f8df91ae.tar.gz vcpkg-2e2c07338f13ca358e6cdf1f589f23a1f8df91ae.zip | |
libiconv - Fix ICONV_CONST (#9832)
* libiconv - Fix ICONV_CONST
* Remove "const" from the second argument of "iconv"
| -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..43d55c0c3 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 "") 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 |