diff options
Diffstat (limited to 'ports/zlib')
| -rw-r--r-- | ports/zlib/0002-android-build-mingw.patch | 21 | ||||
| -rw-r--r-- | ports/zlib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zlib/portfile.cmake | 1 |
3 files changed, 23 insertions, 1 deletions
diff --git a/ports/zlib/0002-android-build-mingw.patch b/ports/zlib/0002-android-build-mingw.patch new file mode 100644 index 000000000..188499df0 --- /dev/null +++ b/ports/zlib/0002-android-build-mingw.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (date 1618364429263) ++++ b/CMakeLists.txt (date 1618364429263) +@@ -170,7 +170,7 @@ + string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" + "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) + +-if(MINGW) ++if(MINGW AND NOT ANDROID) + # This gets us DLL resource information when compiling on MinGW. + if(NOT CMAKE_RC_COMPILER) + set(CMAKE_RC_COMPILER windres.exe) +@@ -186,7 +186,7 @@ + if(BUILD_SHARED_LIBS) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) + endif() +-endif(MINGW) ++endif(MINGW AND NOT ANDROID) + + add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index 9a79b2e7b..a4c1a55d6 100644 --- a/ports/zlib/CONTROL +++ b/ports/zlib/CONTROL @@ -1,5 +1,5 @@ Source: zlib Version: 1.2.11 -Port-Version: 9 +Port-Version: 10 Homepage: https://www.zlib.net/ Description: A compression library diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 0d63291a2..429d85440 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( "cmake_dont_build_more_than_needed.patch" "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch" "add_debug_postfix_on_mingw.patch" + "0002-android-build-mingw.patch" ) # This is generated during the cmake build |