libssh2: don't rely on the system zlib on Linux.

Author: agarny

.github/workflows/cd.yml

@@ -160,11 +160,6 @@ jobs:
         uses: pypa/cibuildwheel@v2.23.3
         env:
           CIBW_ARCHS: auto64
-          CIBW_BEFORE_ALL_LINUX: >
-            export USR_LIB_PATH=/usr/lib/`uname -m`-linux-gnu &&
-            mkdir -p $USR_LIB_PATH &&
-            cd $USR_LIB_PATH &&
-            ln -s /usr/lib64/libz.so
           CIBW_BUILD: 'cp*'
           CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=13.0
           # Note #1: the value of CIBW_ENVIRONMENT_MACOS must be in sync with that of MACOS_DEPLOYMENT_TARGET in

src/3rdparty/CMakeLists.txt

@@ -116,7 +116,7 @@ add_package(libSBML) # Requires libxml2.
 add_package(libNuML) # Requires libSBML.
 
 if(NOT EMSCRIPTEN)
-    add_package(libssh2) # Requires OpenSSL.
+    add_package(libssh2) # Requires OpenSSL and zlib.
 endif()
 
 add_package(zipper) # Requires zlib.

src/3rdparty/libcurl/CMakeLists.txt

@@ -30,42 +30,42 @@ if(LIBOPENCOR_PREBUILT_LIBCURL)
             if(INTEL_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 305e24bcead97613af21ce7d4a918ada7bd1d3d4)
+                                 57b00e594d1a7a57397321344427fa575ad5cece)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 aca3a811d1f7da2af1a5824837ffff4ef464b7df)
+                                 1454a315b9ca7bd6e09eafd8fe8bf4bed835db74)
             endif()
         else()
             if(INTEL_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 860c55ddf58677120c1529029df2285bfaa42703)
+                                 b55ab1b9383c102940d809f83c527c2fdcb2e417)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 d703b9a75a8784102d7709a89de1b24efc7f7484)
+                                 45e6ac7aba1f666a5d6aadf3e4642a5684136b56)
             endif()
         endif()
     elseif(APPLE)
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             ff199eca4533c8cb4df389d4210173e13a39e001)
+                             75d72720b6dbbf85aa2d4560deaf6a1e761c2f00)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             daacb41a209b84b6cb55f10a462d8abe68ee20df)
+                             52e20f45fe5740153b01c68200b23822ab1f36a5)
         endif()
     else()
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             9b007722dfd1359c939b3639e1ef404ded925728)
+                             9d49793720b0c009fd47be2811040aa99da3d941)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             078a3fbb2aa417c3100fbacba6a76354cff92494)
+                             e21cd5b668b58495751140ef7f64cd30cb31a5f8)
         endif()
     endif()
 else()

src/3rdparty/libssh2/CMakeLists.txt

@@ -26,42 +26,42 @@ if(LIBOPENCOR_PREBUILT_LIBSSH2)
             if(INTEL_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 88ea03697534be46a83a5e5e8341c712ae4552db)
+                                 25f2d940a79f8fbe03cc0ae07062c673bcd2f606)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 069cc72dc18316c1471fcc02188e2ca2eeedcac5)
+                                 0f735daadcb69c8e6433b97941cd2d92d8b8af21)
             endif()
         else()
             if(INTEL_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 9e6b04d193b9acaaa5f1b966b48ca5efd93f7157)
+                                 c4518bc5c088a4a0fe7759a346e54a2c204645f8)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 b009196f8eee49fc10202e018fb8efbb15ffa736)
+                                 a7e0984a3900512638807138b6c3bc0537f5e420)
             endif()
         endif()
     elseif(APPLE)
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             bbc92f3e041f37550da1c4ab9485a0b97325e9a2)
+                             f87739f5ed57f9ff820e2f5df68d9983d0029d0e)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             b07761278c9eed1575aaa110eee9fe39896dd2ad)
+                             9b15a45e6f10ec5cb8061d431a356b622e1968bd)
         endif()
     else()
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             e750ebdaf1fe26b84097cc65ad45a287df189776)
+                             19a1a3960b77815b93eeb53f3d04e8ae72dee35a)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             32bf276760631c274c690e3df0e0671536aa39c0)
+                             4b4603099b6e843a700edc19229119cc3378b79e)
         endif()
     endif()
 else()
@@ -79,8 +79,9 @@ else()
             ${CMAKE_ARGS}
             -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
             -DCRYPTO_BACKEND=OpenSSL
-            -DENABLE_ZLIB_COMPRESSION=OFF
             -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
+            -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR}
+            -DZLIB_LIBRARY=${ZLIB_LIBRARY_FILE}
     )
 
     # Patch some of our CMake configuration files.
@@ -89,6 +90,10 @@ else()
 
     file(READ ${CONFIG_FILE} FILE_CONTENTS)
 
+    foreach(LIBRARY zlib)
+        string(REPLACE "${PREBUILT_DIR}/${LIBRARY}" "\${_IMPORT_PREFIX}/../${LIBRARY}" FILE_CONTENTS "${FILE_CONTENTS}")
+    endforeach()
+
     if(APPLE)
         string(REGEX REPLACE "/Applications/Xcode.*\.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/lib" "$<LINK_ONLY:" FILE_CONTENTS "${FILE_CONTENTS}")
         string(REPLACE ".tbd" ">" FILE_CONTENTS "${FILE_CONTENTS}")