aboutsummaryrefslogtreecommitdiff
path: root/ports/zlib
diff options
context:
space:
mode:
authorTodor Prokopov <koprok@users.noreply.github.com>2020-02-12 03:30:03 +0200
committerGitHub <noreply@github.com>2020-02-11 17:30:03 -0800
commitf478be7479f4a418d46c34156bb34ae4f87656af (patch)
treeaebf211e460ef405e7e5cd6787d5732b9dd4bc62 /ports/zlib
parent5f12ffae8d6444383ed6d88da08ee32876726ebc (diff)
downloadvcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.tar.gz
vcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.zip
[many ports] Support building with MinGW toolchain (#8940)
* Some package fixes necessary to build with MinGW toolchain * [libraqm] Fix build error caused by trying to write to source directory * [tmxparser] Fix build failure when tmx port is intalled before tmxparser port System include path was added first on compiler command line. This leads to build failure when there is a tmx.h header file in system include path. * [qt5-base][angle] Trigger CI rebuild * [kd-soap] Fix build error * Update ci.baseline Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/zlib')
-rw-r--r--ports/zlib/CONTROL2
-rw-r--r--ports/zlib/cmake_dont_build_more_than_needed.patch58
-rw-r--r--ports/zlib/portfile.cmake10
3 files changed, 46 insertions, 24 deletions
diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL
index aa7c7b6e9..601fb1bc0 100644
--- a/ports/zlib/CONTROL
+++ b/ports/zlib/CONTROL
@@ -1,4 +1,4 @@
Source: zlib
-Version: 1.2.11-5
+Version: 1.2.11-6
Homepage: https://www.zlib.net/
Description: A compression library
diff --git a/ports/zlib/cmake_dont_build_more_than_needed.patch b/ports/zlib/cmake_dont_build_more_than_needed.patch
index 229a2d055..a374f76d6 100644
--- a/ports/zlib/cmake_dont_build_more_than_needed.patch
+++ b/ports/zlib/cmake_dont_build_more_than_needed.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0fe939d..8d2f5f1 100644
+index 0fe939d..a1291d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ set(VERSION "1.2.11")
@@ -10,24 +10,56 @@ index 0fe939d..8d2f5f1 100644
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-@@ -211,7 +212,15 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
+@@ -124,9 +125,11 @@ set(ZLIB_SRCS
+ )
+
+ if(NOT MINGW)
+- set(ZLIB_DLL_SRCS
+- win32/zlib1.rc # If present will override custom build rule below.
+- )
++ if(BUILD_SHARED_LIBS)
++ set(ZLIB_DLL_SRCS
++ win32/zlib1.rc # If present will override custom build rule below.
++ )
++ endif()
+ endif()
+
+ if(CMAKE_COMPILER_IS_GNUCC)
+@@ -180,11 +183,12 @@ if(MINGW)
+ -I ${CMAKE_CURRENT_BINARY_DIR}
+ -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+ -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+- set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
++ if(BUILD_SHARED_LIBS)
++ set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
++ endif()
+ endif(MINGW)
+
+-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++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)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+@@ -201,7 +205,7 @@ endif()
+
+ if(UNIX)
+ # On unix-like platforms the library is almost always called libz
+- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
++ set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+ if(NOT APPLE)
+ set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+ endif()
+@@ -211,7 +215,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
endif()
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
- install(TARGETS zlib zlibstatic
-+ if (BUILD_SHARED_LIBS)
-+ set(ZLIB_TARGETS zlib)
-+ set_target_properties(zlibstatic PROPERTIES EXCLUDE_FROM_ALL ON)
-+ else()
-+ set(ZLIB_TARGETS zlibstatic)
-+ set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL ON)
-+ endif()
-+
-+ install(TARGETS ${ZLIB_TARGETS}
++ install(TARGETS zlib
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-@@ -230,6 +239,7 @@ endif()
+@@ -230,6 +234,7 @@ endif()
# Example binaries
#============================================================================
@@ -35,7 +67,7 @@ index 0fe939d..8d2f5f1 100644
add_executable(example test/example.c)
target_link_libraries(example zlib)
add_test(example example)
-@@ -247,3 +257,4 @@ if(HAVE_OFF64_T)
+@@ -247,3 +252,4 @@ if(HAVE_OFF64_T)
target_link_libraries(minigzip64 zlib)
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
endif()
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index 78030309b..01c331b11 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -31,16 +31,6 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
-# Both dynamic and static are built, so keep only the one needed
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/lib/zlib.lib)
- endif()
- if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibd.lib)
- endif()
-endif()
-
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zlib RENAME copyright)
vcpkg_copy_pdbs()