diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-08-11 05:32:23 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 15:32:23 -0700 |
| commit | fca18ba3572f8aebe3b8158c359db62a7e26134e (patch) | |
| tree | f12d1e430165e16fae868fdafc83c33ed686e2a6 /ports/zlib | |
| parent | ffd6ae40d5220e6c9b89bf1eeeb1f2b1b774edce (diff) | |
| download | vcpkg-fca18ba3572f8aebe3b8158c359db62a7e26134e.tar.gz vcpkg-fca18ba3572f8aebe3b8158c359db62a7e26134e.zip | |
[zlib, libpng] Fix pkg-config for mingw (#12753)
* [zlib] Fix pkg-config for mingw
* [libpng] Fix pkg-config for mingw
Diffstat (limited to 'ports/zlib')
| -rw-r--r-- | ports/zlib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zlib/add_debug_postfix_on_mingw.patch | 13 | ||||
| -rw-r--r-- | ports/zlib/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index b02b948ad..3196577b5 100644 --- a/ports/zlib/CONTROL +++ b/ports/zlib/CONTROL @@ -1,5 +1,5 @@ Source: zlib Version: 1.2.11 -Port-Version: 7 +Port-Version: 8 Homepage: https://www.zlib.net/ Description: A compression library diff --git a/ports/zlib/add_debug_postfix_on_mingw.patch b/ports/zlib/add_debug_postfix_on_mingw.patch new file mode 100644 index 000000000..22172ccfc --- /dev/null +++ b/ports/zlib/add_debug_postfix_on_mingw.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fe939d..e4fc213 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,7 @@ endif() + # + check_include_file(unistd.h Z_HAVE_UNISTD_H) + +-if(MSVC) ++if(WIN32) + set(CMAKE_DEBUG_POSTFIX "d") + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index c05e7e252..14faef4c8 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( REF ${VERSION} PATCHES "cmake_dont_build_more_than_needed.patch" + "add_debug_postfix_on_mingw.patch" ) # This is generated during the cmake build |