diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-04-03 03:46:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 12:46:30 -0700 |
| commit | db0ec30af6eb8d548a324ec7ab31b8467d85464e (patch) | |
| tree | 4d20f8ae3a5e2018ff2f548ac6ccf36c4c71a7d1 /ports/libmariadb/fix-iconv.patch | |
| parent | 10e85f2cd126e22f6ee23c0ffe4e4f150ddf05a1 (diff) | |
| download | vcpkg-db0ec30af6eb8d548a324ec7ab31b8467d85464e.tar.gz vcpkg-db0ec30af6eb8d548a324ec7ab31b8467d85464e.zip | |
[libmariadb] update to the 3.1.12 (#17004)
* [libmariadb] update to the 3.1.12
* update version
* Add keyword FEATURES
* update version
Diffstat (limited to 'ports/libmariadb/fix-iconv.patch')
| -rw-r--r-- | ports/libmariadb/fix-iconv.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/libmariadb/fix-iconv.patch b/ports/libmariadb/fix-iconv.patch index dd34fc2cf..a3b428421 100644 --- a/ports/libmariadb/fix-iconv.patch +++ b/ports/libmariadb/fix-iconv.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd716e3..7b694e9 100644 +index 203fca7..65cc350 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -346,7 +346,8 @@ ENDIF() +@@ -342,7 +342,8 @@ ENDIF() IF(WITH_ICONV) IF(NOT WIN32) @@ -12,10 +12,10 @@ index cd716e3..7b694e9 100644 ENDIF() ENDIF() -@@ -363,8 +364,8 @@ IF(WIN32) +@@ -359,8 +360,8 @@ IF(WIN32) SET(SYSTEM_LIBS ws2_32 advapi32 kernel32 shlwapi crypt32 ${LIBZ}) ELSE() - SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBPTHREAD} ${LIBDL} ${LIBM}) + SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBPTHREAD} ${CMAKE_DL_LIBS} ${LIBM}) - IF(ICONV_EXTERNAL) - SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${ICONV_LIBRARIES}) + IF(WITH_ICONV) |