Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libzip: add version 1.11.2 #25782

Merged
merged 2 commits into from
Nov 4, 2024
Merged

libzip: add version 1.11.2 #25782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb4b6ae
libzip: add version 1.11.2
toge Nov 1, 2024
6d4145d
Launch new CI
jcar87 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions recipes/libzip/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
13 changes: 13 additions & 0 deletions recipes/libzip/all/patches/1.11.2-0002-remove-rpath.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 2 additions & 0 deletions recipes/libzip/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.11.2":
folder: all
"1.11.1":
folder: all
"1.10.1":
Expand Down