diff --git a/recipes/libzip/all/conandata.yml b/recipes/libzip/all/conandata.yml index 94b4bd310d368..9567df4b1e773 100644 --- a/recipes/libzip/all/conandata.yml +++ b/recipes/libzip/all/conandata.yml @@ -1,4 +1,9 @@ sources: + "1.11.2": + url: + - "https://libzip.org/download/libzip-1.11.2.tar.gz" + - "https://github.com/nih-at/libzip/releases/download/v1.11.2/libzip-1.11.2.tar.gz" + sha256: "6b2a43837005e1c23fdfee532b78f806863e412d2089b9c42b49ab08cbcd7665" "1.11.1": url: - "https://libzip.org/download/libzip-1.11.1.tar.gz" @@ -25,6 +30,13 @@ sources: - "https://github.com/nih-at/libzip/releases/download/v1.7.3/libzip-1.7.3.tar.gz" sha256: "0e2276c550c5a310d4ebf3a2c3dfc43fb3b4602a072ff625842ad4f3238cb9cc" patches: + "1.11.2": + - patch_file: "patches/1.7.3-0001-cmake-install-bundle.patch" + patch_description: "fix installation path of utilities" + patch_type: "conan" + - patch_file: "patches/1.11.2-0002-remove-rpath.patch" + patch_description: "remove rpath feature" + patch_type: "conan" "1.11.1": - patch_file: "patches/1.7.3-0001-cmake-install-bundle.patch" patch_description: "fix installation path of utilities" diff --git a/recipes/libzip/all/patches/1.11.2-0002-remove-rpath.patch b/recipes/libzip/all/patches/1.11.2-0002-remove-rpath.patch new file mode 100644 index 0000000000000..2d5c920bd02c6 --- /dev/null +++ b/recipes/libzip/all/patches/1.11.2-0002-remove-rpath.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23e0f0f..85dec3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -293,7 +293,7 @@ if(WIN32) + endif(WIN32) + + # rpath handling: use rpath in installed binaries +-if(NOT CMAKE_SYSTEM_NAME MATCHES Linux) ++if(0) + set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() diff --git a/recipes/libzip/config.yml b/recipes/libzip/config.yml index 19f19cbdad07f..4c71d7dcc950f 100644 --- a/recipes/libzip/config.yml +++ b/recipes/libzip/config.yml @@ -1,4 +1,6 @@ versions: + "1.11.2": + folder: all "1.11.1": folder: all "1.10.1":