diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-04 02:09:05 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-04 02:09:44 +0200 |
| commit | 8d445166aaaa9c00abbdc582b73a3e4664ece5ad (patch) | |
| tree | 84d1bb30c6a9023fe6a07ea5424d891168db4136 | |
| parent | sys-kernel/gentoo-sources: Clean-up of 5.0.X series (diff) | |
| download | gentoo-8d445166.tar.gz gentoo-8d445166.tar.bz2 gentoo-8d445166.zip | |
dev-libs/libzip: Fix USE mbedtls
Closes: https://bugs.gentoo.org/680820
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 | ||||
| -rw-r--r-- | dev-libs/libzip/libzip-1.5.2-r1.ebuild | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch new file mode 100644 index 000000000000..564cc9b79f1d --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch @@ -0,0 +1,23 @@ +From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <tk@giga.or.at> +Date: Tue, 2 Apr 2019 15:26:06 +0200 +Subject: [PATCH] mbedtls: link against the correct library + +Inspired by https://github.com/nih-at/libzip/pull/88 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f252b3f7..f8eb16eeb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,7 +42,7 @@ ELSE() + ENDIF() + IF(ENABLE_MBEDTLS) + FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) +- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) ++ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) + ELSE() + SET(MBEDTLS_LIBRARIES FALSE) + ENDIF() diff --git a/dev-libs/libzip/libzip-1.5.2-r1.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild index 795775cb0b0d..814a668c4300 100644 --- a/dev-libs/libzip/libzip-1.5.2-r1.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild @@ -30,6 +30,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 + pkg_setup() { # Upstream doesn't support building dynamic & static # simultaneously: https://github.com/nih-at/libzip/issues/76 |