| 1 |
commit: 8d445166aaaa9c00abbdc582b73a3e4664ece5ad |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 4 00:09:05 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 4 00:09:44 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d445166 |
| 7 |
|
| 8 |
dev-libs/libzip: Fix USE mbedtls |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/680820 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 +++++++++++++++++++++++ |
| 15 |
dev-libs/libzip/libzip-1.5.2-r1.ebuild | 2 ++ |
| 16 |
2 files changed, 25 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..564cc9b79f1 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch |
| 23 |
@@ -0,0 +1,23 @@ |
| 24 |
+From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Thomas Klausner <tk@×××××××.at> |
| 26 |
+Date: Tue, 2 Apr 2019 15:26:06 +0200 |
| 27 |
+Subject: [PATCH] mbedtls: link against the correct library |
| 28 |
+ |
| 29 |
+Inspired by https://github.com/nih-at/libzip/pull/88 |
| 30 |
+--- |
| 31 |
+ CMakeLists.txt | 2 +- |
| 32 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 33 |
+ |
| 34 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 35 |
+index 3f252b3f7..f8eb16eeb 100644 |
| 36 |
+--- a/CMakeLists.txt |
| 37 |
++++ b/CMakeLists.txt |
| 38 |
+@@ -42,7 +42,7 @@ ELSE() |
| 39 |
+ ENDIF() |
| 40 |
+ IF(ENABLE_MBEDTLS) |
| 41 |
+ FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) |
| 42 |
+- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) |
| 43 |
++ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) |
| 44 |
+ ELSE() |
| 45 |
+ SET(MBEDTLS_LIBRARIES FALSE) |
| 46 |
+ ENDIF() |
| 47 |
|
| 48 |
diff --git a/dev-libs/libzip/libzip-1.5.2-r1.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild |
| 49 |
index 795775cb0b0..814a668c430 100644 |
| 50 |
--- a/dev-libs/libzip/libzip-1.5.2-r1.ebuild |
| 51 |
+++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild |
| 52 |
@@ -30,6 +30,8 @@ DEPEND=" |
| 53 |
" |
| 54 |
RDEPEND="${DEPEND}" |
| 55 |
|
| 56 |
+PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 |
| 57 |
+ |
| 58 |
pkg_setup() { |
| 59 |
# Upstream doesn't support building dynamic & static |
| 60 |
# simultaneously: https://github.com/nih-at/libzip/issues/76 |
Archives