From 6e5ed4e6df1524b3991944290ac44e70f64d271b Mon Sep 17 00:00:00 2001 From: Corentin Schreiber Date: Tue, 21 Jan 2025 14:10:22 +0000 Subject: [PATCH] libzip: add 1.11.3 (#26421) --- recipes/libzip/all/conandata.yml | 9 +++++++++ .../all/patches/1.11.3-0002-remove-rpath.patch | 13 +++++++++++++ recipes/libzip/config.yml | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 recipes/libzip/all/patches/1.11.3-0002-remove-rpath.patch diff --git a/recipes/libzip/all/conandata.yml b/recipes/libzip/all/conandata.yml index 9567df4b1e773..05c2c01d18c18 100644 --- a/recipes/libzip/all/conandata.yml +++ b/recipes/libzip/all/conandata.yml @@ -1,4 +1,9 @@ sources: + "1.11.3": + url: + - "https://libzip.org/download/libzip-1.11.3.tar.gz" + - "https://github.com/nih-at/libzip/releases/download/v1.11.3/libzip-1.11.3.tar.gz" + sha256: "76653f135dde3036036c500e11861648ffbf9e1fc5b233ff473c60897d9db0ea" "1.11.2": url: - "https://libzip.org/download/libzip-1.11.2.tar.gz" @@ -30,6 +35,10 @@ sources: - "https://github.com/nih-at/libzip/releases/download/v1.7.3/libzip-1.7.3.tar.gz" sha256: "0e2276c550c5a310d4ebf3a2c3dfc43fb3b4602a072ff625842ad4f3238cb9cc" patches: + "1.11.3": + - patch_file: "patches/1.11.3-0002-remove-rpath.patch" + patch_description: "remove rpath feature" + patch_type: "conan" "1.11.2": - 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.3-0002-remove-rpath.patch b/recipes/libzip/all/patches/1.11.3-0002-remove-rpath.patch new file mode 100644 index 0000000000000..348a4d0295fdc --- /dev/null +++ b/recipes/libzip/all/patches/1.11.3-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 +@@ -290,7 +290,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 4c71d7dcc950f..a7b743c153241 100644 --- a/recipes/libzip/config.yml +++ b/recipes/libzip/config.yml @@ -1,4 +1,6 @@ versions: + "1.11.3": + folder: all "1.11.2": folder: all "1.11.1":